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

merged master

Browse Source
This commit is contained in:
Mo Bitar
2017-03-01 17:52:37 -06:00
parent b279678911 f7f0522f70
commit e029b7c1a4
16 changed files with 239 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,6 @@ class SyncManager {
var saved = this.handleItemsResponse(response.saved_items, omitFields);
this.handleUnsavedItemsResponse(response.unsaved)
this.writeItemsToLocalStorage(saved, false, null);
this.writeItemsToLocalStorage(retrieved, false, null);
@@ -213,7 +212,7 @@ class SyncManager {
}.bind(this), function(response){
console.log("Sync error: ", response);
var error = response.data ? response.data.error : {message: "Could not connect to server."};
var error = response ? response.error : {message: "Could not connect to server."};
this.syncStatus.syncOpInProgress = false;
this.syncStatus.error = error;