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

Database class cleanup

Browse Source
This commit is contained in:
Mo Bitar
2020-03-25 16:33:03 -05:00
parent 7aa38cbdb8
commit a80a94de5e
5 changed files with 544 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/controllers/applicationView.js
View File

@@ -91,7 +91,10 @@ class ApplicationViewCtrl extends PureCtrl {
super.onAppEvent(eventName);
if (eventName === ApplicationEvents.LocalDataIncrementalLoad) {
this.updateLocalDataStatus();
} else if (eventName === ApplicationEvents.SyncStatusChanged) {
} else if (
eventName === ApplicationEvents.SyncStatusChanged ||
eventName === ApplicationEvents.FailedSync
) {
this.updateSyncStatus();
} else if (eventName === ApplicationEvents.LocalDataLoaded) {
this.updateLocalDataStatus();
@@ -153,7 +156,12 @@ class ApplicationViewCtrl extends PureCtrl {
updateSyncStatus() {
const syncStatus = this.application.getSyncStatus();
const stats = syncStatus.getStats();
if (stats.downloadCount > 20) {
if (syncStatus.hasError()) {
this.syncStatus = this.application.getStatusService().replaceStatusWithString(
this.syncStatus,
'Unable to Sync'
);
} else if (stats.downloadCount > 20) {
const text = `Downloading ${stats.downloadCount} items. Keep app open.`;
this.syncStatus = this.application.getStatusService().replaceStatusWithString(
this.syncStatus,