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

auto delete conflicts and show conflict flag

Browse Source
This commit is contained in:
Mo Bitar
2017-04-21 11:19:14 -05:00
parent ad92c0894d
commit ea77ef99bf
8 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/app/services/syncManager.js
View File

@@ -268,7 +268,29 @@ class SyncManager {
handleItemsResponse(responseItems, omitFields) {
EncryptionHelper.decryptMultipleItems(responseItems, this.authManager.keys());
return this.modelManager.mapResponseItemsToLocalModelsOmittingFields(responseItems, omitFields);
var items = this.modelManager.mapResponseItemsToLocalModelsOmittingFields(responseItems, omitFields);
this.handleSyncConflicts(items);
return items;
}
handleSyncConflicts(items) {
var needsSync = false;
for(var item of items) {
if(item.conflict_of) {
var original = this.modelManager.findItem(item.conflict_of);
// check if item contents are equal. If so, automatically delete conflict
if(JSON.stringify(item.structureParams()) === JSON.stringify(original.structureParams())) {
this.modelManager.setItemToBeDeleted(item);
needsSync = true;
}
}
}
if(needsSync) {
setTimeout(function () {
this.sync();
}.bind(this), 100);
}
}
clearSyncToken() {