diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/DocServer.ts | 11 | ||||
| -rw-r--r-- | src/client/views/MainView.tsx | 17 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts index 5af89cf49..977eb7772 100644 --- a/src/client/DocServer.ts +++ b/src/client/DocServer.ts @@ -33,7 +33,7 @@ export namespace DocServer { } const fieldWriteModes: { [field: string]: WriteMode } = {}; - const docsWithUpdates: { [field: string]: Doc[] } = {}; + const docsWithUpdates: { [field: string]: Set<Doc> } = {}; export function setFieldWriteMode(field: string, writeMode: WriteMode) { fieldWriteModes[field] = writeMode; @@ -50,12 +50,15 @@ export namespace DocServer { return fieldWriteModes[field]; } - export function registerDocWithCachedUpdate(doc: Doc, field: string) { + export function registerDocWithCachedUpdate(doc: Doc, field: string, oldValue: any) { let list = docsWithUpdates[field]; if (!list) { - list = docsWithUpdates[field] = []; + list = docsWithUpdates[field] = new Set; + } + if (!list.has(doc)) { + Doc.AddCachedUpdate(doc, field, oldValue); + list.add(doc); } - list.push(doc); } export function init(protocol: string, hostname: string, port: number, identifier: string) { diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index ddb023aca..7629a0906 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -435,6 +435,7 @@ export class MainView extends React.Component { } + private mode: DocServer.WriteMode = DocServer.WriteMode.Always; @observable private _colorPickerDisplay = false; /* for the expandable add nodes menu. Not included with the miscbuttons because once it expands it expands the whole div with it, making canvas interactions limited. */ nodesMenu() { @@ -479,15 +480,13 @@ export class MainView extends React.Component { </button> </div></li>)} <li key="undoTest"><button className="add-button round-button" title="Click if undo isn't working" onClick={() => UndoManager.TraceOpenBatches()}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li> - <li key="test"><button className="add-button round-button" title="asdf" onClick={(() => { - let state = DocServer.WriteMode.Always; - return () => { - state++; - state = state % 3; - DocServer.setFieldWriteMode("x", state); - DocServer.setFieldWriteMode("y", state); - }; - })()}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li> + <li key="test"><button className="add-button round-button" title="asdf" onClick={() => { + this.mode++; + this.mode = this.mode % 3; + console.log(DocServer.WriteMode[this.mode]); + DocServer.setFieldWriteMode("x", this.mode); + DocServer.setFieldWriteMode("y", this.mode); + }}><FontAwesomeIcon icon="exclamation" size="sm" /></button></li> <li key="color"><button className="add-button round-button" title="Select Color" style={{ zIndex: 1000 }} onClick={() => this.toggleColorPicker()}><div className="toolbar-color-button" style={{ backgroundColor: InkingControl.Instance.selectedColor }} > <div className="toolbar-color-picker" onClick={this.onColorClick} style={this._colorPickerDisplay ? { color: "black", display: "block" } : { color: "black", display: "none" }}> <SketchPicker color={InkingControl.Instance.selectedColor} onChange={InkingControl.Instance.switchColor} /> |