This commit is contained in:
Mo Bitar
2020-02-05 17:00:11 -06:00
parent 1ae3790ea3
commit 13dd41b9ab
10 changed files with 479 additions and 4963 deletions

View File

@@ -5,11 +5,11 @@ class SyncResolutionMenuCtrl {
constructor(
$timeout,
archiveManager,
syncManager,
application
) {
this.$timeout = $timeout;
this.archiveManager = archiveManager;
this.syncManager = syncManager;
this.application = application;
this.status = {};
}
@@ -24,11 +24,11 @@ class SyncResolutionMenuCtrl {
async performSyncResolution() {
this.status.resolving = true;
await this.syncManager.resolveOutOfSync();
await this.application.resolveOutOfSync();
this.$timeout(() => {
this.status.resolving = false;
this.status.attemptedResolution = true;
if (this.syncManager.isOutOfSync()) {
if (this.application.getSyncStatus().isOutOfSync()) {
this.status.fail = true;
} else {
this.status.success = true;