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

Wait for initial data load before resolving singletons

Browse Source
This commit is contained in:
Mo Bitar
2018-12-20 10:17:34 -06:00
parent cb6f44da3a
commit 711fdc061c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/app/services/singletonManager.js
View File

@@ -24,6 +24,7 @@ class SingletonManager {
$rootScope.$on("initial-data-loaded", (event, data) => { $rootScope.$on("initial-data-loaded", (event, data) => {
this.resolveSingletons(modelManager.allItems, null, true); this.resolveSingletons(modelManager.allItems, null, true);
this.initialDataLoaded = true;
}) })
/* /*
@@ -41,6 +42,11 @@ class SingletonManager {
}) })
$rootScope.$on("sync:completed", (event, data) => { $rootScope.$on("sync:completed", (event, data) => {
// Wait for initial data load before handling any sync. If we don't want for initial data load,
// then the singleton resolver won't have the proper items to work with to determine whether to resolve or create.
if(!this.initialDataLoaded) {
return;
}
// The reason we also need to consider savedItems in consolidating singletons is in case of sync conflicts, // The reason we also need to consider savedItems in consolidating singletons is in case of sync conflicts,
// a new item can be created, but is never processed through "retrievedItems" since it is only created locally then saved. // a new item can be created, but is never processed through "retrievedItems" since it is only created locally then saved.