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

Merged master

Browse Source
This commit is contained in:
Mo Bitar
2018-06-05 08:10:23 -05:00
parent a0a05553c9 1ce07ae597
commit 5ed81f5131
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,7 +371,7 @@ class ComponentManager {
// push immediately now // push immediately now
var items = []; var items = [];
for(var contentType of message.data.content_types) { for(var contentType of message.data.content_types) {
items = items.concat(this.modelManager.itemsForContentType(contentType)); items = items.concat(this.modelManager.validItemsForContentType(contentType));
} }
this.sendItemsInReply(component, items, message); this.sendItemsInReply(component, items, message);
}); });
@@ -499,8 +499,9 @@ class ComponentManager {
this.syncManager.sync("handleCreateItemMessage"); this.syncManager.sync("handleCreateItemMessage");
// "create-item" or "create-items" are possible messages handled here
let reply = let reply =
message.action == "save-item" ? message.action == "create-item" ?
{item: this.jsonForItem(processedItems[0], component)} {item: this.jsonForItem(processedItems[0], component)}
: :
{items: processedItems.map((item) => {return this.jsonForItem(item, component)})} {items: processedItems.map((item) => {return this.jsonForItem(item, component)})}

12
app/assets/javascripts/app/services/modelManager.js
View File

@@ -102,9 +102,9 @@ class ModelManager {
}) })
} }
itemsForContentType(contentType) { validItemsForContentType(contentType) {
return this.allItems.filter(function(item){ return this.allItems.filter((item) => {
return item.content_type == contentType; return item.content_type == contentType && !item.errorDecrypting;
}); });
} }
@@ -185,7 +185,11 @@ class ModelManager {
this.addItem(item, isDirtyItemPendingDelete); this.addItem(item, isDirtyItemPendingDelete);
modelsToNotifyObserversOf.push(item); // Observers do not need to handle items that errored while decrypting.
if(!item.errorDecrypting) {
modelsToNotifyObserversOf.push(item);
}
models.push(item); models.push(item);
processedObjects.push(json_obj); processedObjects.push(json_obj);
} }