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

Component manager do not save locked items

Browse Source
This commit is contained in:
Mo Bitar
2018-08-17 09:57:22 -05:00
parent 9926f90697
commit 69c82bc362
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/javascripts/app/services/componentManager.js
View File

@@ -479,6 +479,24 @@ class ComponentManager {
We map the items here because modelManager is what updates the UI. If you were to instead get the items directly, We map the items here because modelManager is what updates the UI. If you were to instead get the items directly,
this would update them server side via sync, but would never make its way back to the UI. this would update them server side via sync, but would never make its way back to the UI.
*/ */
// Filter locked items
var ids = responseItems.map((i) => {return i.uuid});
var items = this.modelManager.findItems(ids);
var lockedCount = 0;
for(var item of items) {
if(item.locked) {
_.remove(responseItems, {uuid: item.uuid});
lockedCount++;
}
}
if(lockedCount > 0) {
var itemNoun = lockedCount == 1 ? "item" : "items";
var auxVerb = lockedCount == 1 ? "is" : "are";
alert(`${lockedCount} ${itemNoun} you are attempting to save ${auxVerb} locked and cannot be edited.`);
}
var localItems = this.modelManager.mapResponseItemsToLocalModels(responseItems, SFModelManager.MappingSourceComponentRetrieved, component.uuid); var localItems = this.modelManager.mapResponseItemsToLocalModels(responseItems, SFModelManager.MappingSourceComponentRetrieved, component.uuid);
for(var responseItem of responseItems) { for(var responseItem of responseItems) {
@@ -488,11 +506,16 @@ class ComponentManager {
alert(`The extension ${component.name} is trying to save an item with type ${responseItem.content_type}, but that item does not exist. Please restart this extension and try again.`); alert(`The extension ${component.name} is trying to save an item with type ${responseItem.content_type}, but that item does not exist. Please restart this extension and try again.`);
continue; continue;
} }
_.merge(item.content, responseItem.content);
if(responseItem.clientData) { // 8/2018: Why did we have this here? `mapResponseItemsToLocalModels` takes care of merging item content. We definitely shouldn't be doing this directly.
item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain); // _.merge(item.content, responseItem.content);
if(!item.locked) {
if(responseItem.clientData) {
item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain);
}
item.setDirty(true);
} }
item.setDirty(true);
} }
this.syncManager.sync().then((response) => { this.syncManager.sync().then((response) => {

2
app/assets/templates/editor.html.haml
View File

@@ -65,7 +65,7 @@
%panel-resizer.left{"ng-if" => "ctrl.marginResizersEnabled", "panel-id" => "'editor-content'", "on-resize-finish" => "ctrl.onPanelResizeFinish","control" => "ctrl.resizeControl", "min-width" => 300, "property" => "'left'", "hoverable" => "true"} %panel-resizer.left{"ng-if" => "ctrl.marginResizersEnabled", "panel-id" => "'editor-content'", "on-resize-finish" => "ctrl.onPanelResizeFinish","control" => "ctrl.resizeControl", "min-width" => 300, "property" => "'left'", "hoverable" => "true"}
%component-view.component-view{"ng-if" => "ctrl.selectedEditor", "component" => "ctrl.selectedEditor", "ng-style" => "ctrl.note.locked && {'pointer-events' : 'none'}", "ng-class" => "{'locked' : ctrl.note.locked }"} %component-view.component-view{"ng-if" => "ctrl.selectedEditor", "component" => "ctrl.selectedEditor"}
%textarea.editable#note-text-editor{"ng-if" => "!ctrl.selectedEditor", "ng-model" => "ctrl.note.text", "ng-readonly" => "ctrl.note.locked", %textarea.editable#note-text-editor{"ng-if" => "!ctrl.selectedEditor", "ng-model" => "ctrl.note.text", "ng-readonly" => "ctrl.note.locked",
"ng-change" => "ctrl.contentChanged()", "ng-trim" => "false", "ng-click" => "ctrl.clickedTextArea()", "ng-change" => "ctrl.contentChanged()", "ng-trim" => "false", "ng-click" => "ctrl.clickedTextArea()",