diff options
| author | bobzel <zzzman@gmail.com> | 2023-01-03 11:30:07 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-01-03 11:30:07 -0500 |
| commit | 93b68ba0ea7a28106583b2d4d767f9fc26aea39b (patch) | |
| tree | 34ff31be1e26798d90f4f0f21b9114fa7ff72e7c /src | |
| parent | 183789b1d5e9ee9d8906a29eb3fde3f651a8c29c (diff) | |
fixed frame num highlight when in editing mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/DocServer.ts | 6 | ||||
| -rw-r--r-- | src/client/util/CurrentUserUtils.ts | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts index ad39529df..cab90138f 100644 --- a/src/client/DocServer.ts +++ b/src/client/DocServer.ts @@ -38,9 +38,9 @@ export namespace DocServer { }); strings.sort().forEach((str, i) => console.log(i.toString() + ' ' + str)); } - const filtered = Array.from(Object.keys(_cache)).filter(key => { + const filtered = Array.from(Object.keys(_cache)).filter(key => { const doc = _cache[key] as Doc; - if (!(StrCast(doc.author).includes(".edu")||StrCast(doc.author).includes(".com")) || doc.author == Doc.CurrentUserEmail) return true; + if (!(StrCast(doc.author).includes('.edu') || StrCast(doc.author).includes('.com')) || doc.author == Doc.CurrentUserEmail) return true; return false; }); @@ -380,7 +380,6 @@ export namespace DocServer { runInAction(() => (FieldLoader.ServerLoadStatus.retrieved = retrieved)); await new Promise(res => setTimeout(res)); } - console.log('<'); // deserialize const prom = SerializationHelper.Deserialize(field).then(async deserialized => { fields[field.id] = deserialized; @@ -393,7 +392,6 @@ export namespace DocServer { } else { delete _cache[field.id]; } - console.log('>'); return deserialized; }); // 4) here, for each of the documents we've requested *ourselves* (i.e. weren't promises or found in the cache) diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index afa9e7de3..f5f3c32d3 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -668,7 +668,7 @@ export class CurrentUserUtils { title: "Perspective", toolTip: "View", btnType: ButtonType.DropdownList, ignoreClick: true, width: 100, scripts: { script: 'setView(value, _readOnly_)'}}, { title: "Pin", icon: "map-pin", toolTip: "Pin View to Trail", btnType: ButtonType.ClickButton, funcs: {hidden: '!SelectionManager_selectedDocType(undefined, "tab")'}, width: 20, scripts: { onClick: 'pinWithView(_readOnly_, altKey)'}}, { title: "Back", icon: "chevron-left", toolTip: "Prev Animation Frame", btnType: ButtonType.ClickButton, funcs: {hidden: '!SelectionManager_selectedDocType(undefined, "freeform") || IsNoviceMode()'}, width: 20, scripts: { onClick: 'prevKeyFrame(_readOnly_)'}}, - { title: "Num", icon: "", toolTip: "Frame Number", btnType: ButtonType.TextButton, funcs: {hidden: '!SelectionManager_selectedDocType(undefined, "freeform") || IsNoviceMode()', buttonText: 'selectedDocs()?.lastElement()?.currentFrame?.toString()'}, width: 20, scripts: { onClick: 'return curKeyFrame(_readOnly_)'}}, + { title: "Num", icon: "", toolTip: "Frame Number", btnType: ButtonType.TextButton, funcs: {hidden: '!SelectionManager_selectedDocType(undefined, "freeform") || IsNoviceMode()', buttonText: 'selectedDocs()?.lastElement()?.currentFrame?.toString()'}, width: 20, scripts: { script: '{ return curKeyFrame(_readOnly_);}'}}, { title: "Fwd", icon: "chevron-right", toolTip: "Next Animation Frame", btnType: ButtonType.ClickButton, funcs: {hidden: '!SelectionManager_selectedDocType(undefined, "freeform") || IsNoviceMode()'}, width: 20, scripts: { onClick: 'nextKeyFrame(_readOnly_)'}}, { title: "Fill", icon: "fill-drip", toolTip: "Background Fill Color",btnType: ButtonType.ColorButton, funcs: {hidden: '!SelectionManager_selectedDocType()'}, ignoreClick: true, width: 20, scripts: { script: 'return setBackgroundColor(value, _readOnly_)'}}, // Only when a document is selected { title: "Header", icon: "heading", toolTip: "Header Color", btnType: ButtonType.ColorButton, funcs: {hidden: '!SelectionManager_selectedDocType()'}, ignoreClick: true, scripts: { script: 'return setHeaderColor(value, _readOnly_)'}}, |