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

Alternating uuid logic and tests

Browse Source
This commit is contained in:
Mo Bitar
2018-07-02 11:11:56 -05:00
parent 7625e037fe
commit 82b1586fd7
4 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app/directives/views/accountMenu.js
View File

@@ -154,7 +154,7 @@ class AccountMenu {
}
else {
modelManager.resetLocalMemory();
storageManager.clearAllModels().them(() => {
storageManager.clearAllModels().then(() => {
block();
})
}

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

@@ -83,29 +83,27 @@ class ModelManager extends SFModelManager {
// remove from relevant array, but don't remove from all items.
// This way, it's removed from the display, but still synced via get dirty items
if(item.content_type == "Tag") {
_.pull(this.tags, item);
} else if(item.content_type == "Note") {
_.pull(this.notes, item);
} else if(item.content_type == "Extension") {
_.pull(this._extensions, item);
}
this.removeItemFromRespectiveArray(item);
}
removeItemLocally(item, callback) {
super.removeItemLocally(item, callback);
if(item.content_type == "Tag") {
_.pull(this.tags, item);
} else if(item.content_type == "Note") {
_.pull(this.notes, item);
} else if(item.content_type == "Extension") {
_.pull(this._extensions, item);
}
this.removeItemFromRespectiveArray(item);
this.storageManager.deleteModel(item).then(callback);
}
removeItemFromRespectiveArray(item) {
if(item.content_type == "Tag") {
_.remove(this.tags, {uuid: item.uuid});
} else if(item.content_type == "Note") {
_.remove(this.notes, {uuid: item.uuid});
} else if(item.content_type == "Extension") {
_.remove(this._extensions, {uuid: item.uuid});
}
}
/*
Misc
*/