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

Component save-item make sure it exists

Browse Source
This commit is contained in:
Mo Bitar
2018-07-20 19:12:14 -05:00
parent 0441087ca0
commit 8a8d37dd43
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ angular.module('app')
} }
}) })
.controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, actionsManager, syncManager, modelManager, themeManager, componentManager, storageManager, sessionHistory) { .controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, actionsManager, syncManager, modelManager, themeManager, componentManager, storageManager, sessionHistory) {
this.spellcheck = true; this.spellcheck = true;
this.componentManager = componentManager; this.componentManager = componentManager;

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

@@ -481,8 +481,13 @@ class ComponentManager {
*/ */
var localItems = this.modelManager.mapResponseItemsToLocalModels(responseItems, SFModelManager.MappingSourceComponentRetrieved, component.uuid); var localItems = this.modelManager.mapResponseItemsToLocalModels(responseItems, SFModelManager.MappingSourceComponentRetrieved, component.uuid);
for(var item of localItems) { for(var responseItem of responseItems) {
var responseItem = _.find(responseItems, {uuid: item.uuid}); var item = _.find(localItems, {uuid: responseItem.uuid});
if(!item) {
// An item this extension is trying to save was possibly removed locally, notify user
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;
}
_.merge(item.content, responseItem.content); _.merge(item.content, responseItem.content);
if(responseItem.clientData) { if(responseItem.clientData) {
item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain); item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain);