rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: use uuid for mutator association

Browse Source
This commit is contained in:
Mo Bitar
2020-04-30 10:52:31 -05:00
parent dee164f4a2
commit bbfb40dcba
3 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/views/editor/editor_view.ts
View File

@@ -434,7 +434,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
noteMutator.prefersPlainEditor = true; noteMutator.prefersPlainEditor = true;
}) })
} }
if (this.activeEditorComponent?.isExplicitlyEnabledForItem(this.note)) { if (this.activeEditorComponent?.isExplicitlyEnabledForItem(this.note.uuid)) {
await this.disassociateComponentWithCurrentNote(this.activeEditorComponent); await this.disassociateComponentWithCurrentNote(this.activeEditorComponent);
} }
await this.reloadComponentEditorState(); await this.reloadComponentEditorState();
@@ -1126,7 +1126,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
if (component.active) { if (component.active) {
this.application.componentManager!.setComponentHidden( this.application.componentManager!.setComponentHidden(
component, component,
!component.isExplicitlyEnabledForItem(this.note) !component.isExplicitlyEnabledForItem(this.note.uuid)
); );
} }
} }
@@ -1162,7 +1162,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
return this.application.changeItem(component.uuid, (m) => { return this.application.changeItem(component.uuid, (m) => {
const mutator = m as ComponentMutator; const mutator = m as ComponentMutator;
mutator.removeAssociatedItemId(note.uuid); mutator.removeAssociatedItemId(note.uuid);
mutator.disassociateWithItem(note); mutator.disassociateWithItem(note.uuid);
}) })
} }
@@ -1171,7 +1171,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
return this.application.changeItem(component.uuid, (m) => { return this.application.changeItem(component.uuid, (m) => {
const mutator = m as ComponentMutator; const mutator = m as ComponentMutator;
mutator.removeDisassociatedItemId(note.uuid); mutator.removeDisassociatedItemId(note.uuid);
mutator.associateWithItem(note); mutator.associateWithItem(note.uuid);
}) })
} }

74
dist/javascripts/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/javascripts/app.js.map vendored
View File

File diff suppressed because one or more lines are too long