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

Fixes issue where deleting one editor may clear the current editor session

Browse Source
This commit is contained in:
Mo Bitar
2018-05-03 18:22:13 -05:00
parent b44570da24
commit a743cdc5c6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/app/controllers/editor.js
View File

@@ -443,12 +443,21 @@ angular.module('app')
// Autocomplete Tags // Autocomplete Tags
this.tagsComponent = component.active ? component : null; this.tagsComponent = component.active ? component : null;
} else if(component.area == "editor-editor") { } else if(component.area == "editor-editor") {
// Editor // An editor is already active, ensure the potential replacement is explicitely enabled for this item
if(component.active && this.note && (component.isExplicitlyEnabledForItem(this.note) || component.isDefaultEditor())) { if(this.selectedEditor) {
this.selectedEditor = component; if(component.isExplicitlyEnabledForItem(this.note)) {
this.selectedEditor = component;
}
} else { } else {
this.selectedEditor = null; // If no selected editor, let's see if the incoming one is a candidate
if(component.active && this.note && (component.isExplicitlyEnabledForItem(this.note) || component.isDefaultEditor())) {
this.selectedEditor = component;
} else {
// Not a candidate, and no selected editor. Disable the current editor by setting selectedEditor to null
this.selectedEditor = null;
}
} }
} else if(component.area == "editor-stack") { } else if(component.area == "editor-stack") {
this.reloadComponentContext(); this.reloadComponentContext();
} }