Incipient TypeScript

app/assets/javascripts/controllers/abstract/pure_ctrl.js

@@ -1,4 +1,4 @@
-import { ApplicationEvents } from 'snjs';
+import { ApplicationEvent } from 'snjs';
 
 export class PureCtrl {
   /* @ngInject */
@@ -84,13 +84,13 @@ export class PureCtrl {
     }
     this.unsubApp = this.application.addEventObserver(async (eventName) => {
       this.onAppEvent(eventName);
-      if (eventName === ApplicationEvents.Started) {
+      if (eventName === ApplicationEvent.Started) {
         await this.onAppStart();
-      } else if (eventName === ApplicationEvents.Launched) {
+      } else if (eventName === ApplicationEvent.Launched) {
         await this.onAppLaunch();
-      } else if (eventName === ApplicationEvents.CompletedSync) {
+      } else if (eventName === ApplicationEvent.CompletedSync) {
         this.onAppSync();
-      } else if (eventName === ApplicationEvents.KeyStatusChanged) {
+      } else if (eventName === ApplicationEvent.KeyStatusChanged) {
         this.onAppKeyChange();
       }
     });

app/assets/javascripts/controllers/applicationView.js

@@ -1,7 +1,7 @@
 import { getPlatformString } from '@/utils';
 import template from '%/application-view.pug';
 import { AppStateEvents } from '@/services/state';
-import { ApplicationEvents } from 'snjs';
+import { ApplicationEvent } from 'snjs';
 import angular from 'angular';
 import {
   PANEL_NAME_NOTES,
@@ -91,34 +91,34 @@ class ApplicationViewCtrl extends PureCtrl {
   /** @override */
   async onAppEvent(eventName) {
     super.onAppEvent(eventName);
-    if (eventName === ApplicationEvents.LocalDataIncrementalLoad) {
+    if (eventName === ApplicationEvent.LocalDataIncrementalLoad) {
       this.updateLocalDataStatus();
     } else if (
-      eventName === ApplicationEvents.SyncStatusChanged ||
-      eventName === ApplicationEvents.FailedSync
+      eventName === ApplicationEvent.SyncStatusChanged ||
+      eventName === ApplicationEvent.FailedSync
     ) {
       this.updateSyncStatus();
-    } else if (eventName === ApplicationEvents.LocalDataLoaded) {
+    } else if (eventName === ApplicationEvent.LocalDataLoaded) {
       this.updateLocalDataStatus();
-    } else if (eventName === ApplicationEvents.WillSync) {
+    } else if (eventName === ApplicationEvent.WillSync) {
       if (!this.completedInitialSync) {
         this.syncStatus = this.application.getStatusService().replaceStatusWithString(
           this.syncStatus,
           "Syncing..."
         );
       }
-    } else if (eventName === ApplicationEvents.CompletedSync) {
+    } else if (eventName === ApplicationEvent.CompletedSync) {
       if (!this.completedInitialSync) {
         this.syncStatus = this.application.getStatusService().removeStatus(this.syncStatus);
         this.completedInitialSync = true;
       }
-    } else if (eventName === ApplicationEvents.InvalidSyncSession) {
+    } else if (eventName === ApplicationEvent.InvalidSyncSession) {
       this.showInvalidSessionAlert();
-    } else if (eventName === ApplicationEvents.LocalDatabaseReadError) {
+    } else if (eventName === ApplicationEvent.LocalDatabaseReadError) {
       this.application.alertService.alert({
         text: 'Unable to load local database. Please restart the app and try again.'
       });
-    } else if (eventName === ApplicationEvents.LocalDatabaseWriteError) {
+    } else if (eventName === ApplicationEvent.LocalDatabaseWriteError) {
       this.application.alertService.alert({
         text: 'Unable to write to local database. Please restart the app and try again.'
       });

app/assets/javascripts/controllers/editor.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 import {
-  ApplicationEvents,
+  ApplicationEvent,
   isPayloadSourceRetrieved,
   ContentTypes,
   ProtectedActions
@@ -113,9 +113,9 @@ class EditorCtrl extends PureCtrl {
     if (!this.state.note) {
       return;
     }
-    if (eventName === ApplicationEvents.HighLatencySync) {
+    if (eventName === ApplicationEvent.HighLatencySync) {
       this.setState({ syncTakingTooLong: true });
-    } else if (eventName === ApplicationEvents.CompletedSync) {
+    } else if (eventName === ApplicationEvent.CompletedSync) {
       this.setState({ syncTakingTooLong: false });
       if (this.state.note.dirty) {
         /** if we're still dirty, don't change status, a sync is likely upcoming. */
@@ -126,7 +126,7 @@ class EditorCtrl extends PureCtrl {
           this.showAllChangesSavedStatus();
         }
       }
-    } else if (eventName === ApplicationEvents.FailedSync) {
+    } else if (eventName === ApplicationEvent.FailedSync) {
       /**
        * Only show error status in editor if the note is dirty.
        * Otherwise, it means the originating sync came from somewhere else
@@ -135,7 +135,7 @@ class EditorCtrl extends PureCtrl {
       if (this.state.note.dirty) {
         this.showErrorStatus();
       }
-    } else if (eventName === ApplicationEvents.LocalDatabaseWriteError) {
+    } else if (eventName === ApplicationEvent.LocalDatabaseWriteError) {
       this.showErrorStatus({
         message: "Offline Saving Issue",
         desc: "Changes not saved"

app/assets/javascripts/controllers/footer.js

@@ -1,6 +1,6 @@
 import { dateToLocalizedString } from '@/utils';
 import {
-  ApplicationEvents,
+  ApplicationEvent,
   TIMING_STRATEGY_FORCE_SPAWN_NEW,
   ProtectedActions,
   ContentTypes
@@ -132,24 +132,24 @@ class FooterCtrl extends PureCtrl {
 
   /** @override */
   onAppEvent(eventName) {
-    if (eventName === ApplicationEvents.KeyStatusChanged) {
+    if (eventName === ApplicationEvent.KeyStatusChanged) {
       this.reloadUpgradeStatus();
-    } else if (eventName === ApplicationEvents.EnteredOutOfSync) {
+    } else if (eventName === ApplicationEvent.EnteredOutOfSync) {
       this.setState({
         outOfSync: true
       });
-    } else if (eventName === ApplicationEvents.ExitedOutOfSync) {
+    } else if (eventName === ApplicationEvent.ExitedOutOfSync) {
       this.setState({
         outOfSync: false
       });
-    } else if (eventName === ApplicationEvents.CompletedSync) {
+    } else if (eventName === ApplicationEvent.CompletedSync) {
       if (this.offline && this.application.getNoteCount() === 0) {
         this.showAccountMenu = true;
       }
       this.syncUpdated();
       this.findErrors();
       this.updateOfflineStatus();
-    } else if (eventName === ApplicationEvents.FailedSync) {
+    } else if (eventName === ApplicationEvent.FailedSync) {
       this.findErrors();
       this.updateOfflineStatus();
     }

app/assets/javascripts/controllers/notes/notes.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 import template from '%/notes.pug';
-import { ApplicationEvents, ContentTypes, removeFromArray } from 'snjs';
+import { ApplicationEvent, ContentTypes, removeFromArray } from 'snjs';
 import { PureCtrl } from '@Controllers';
 import { AppStateEvents } from '@/services/state';
 import { KeyboardModifiers, KeyboardKeys } from '@/services/keyboardManager';
@@ -103,14 +103,14 @@ class NotesCtrl extends PureCtrl {
 
   /** @override */
   async onAppEvent(eventName) {
-    if (eventName === ApplicationEvents.SignedIn) {
+    if (eventName === ApplicationEvent.SignedIn) {
       /** Delete dummy note if applicable */
       if (this.state.selectedNote && this.state.selectedNote.dummy) {
         this.application.deleteItemLocally({ item: this.state.selectedNote });
         await this.selectNote(null);
         await this.reloadNotes();
       }
-    } else if (eventName === ApplicationEvents.CompletedSync) {
+    } else if (eventName === ApplicationEvent.CompletedSync) {
       this.getMostValidNotes().then((notes) => {
         if (notes.length === 0) {
           this.createPlaceholderNote();

app/assets/javascripts/controllers/tags.js

@@ -2,7 +2,7 @@ import {
   SNNote,
   SNSmartTag,
   ContentTypes,
-  ApplicationEvents,
+  ApplicationEvent,
   ComponentActions
 } from 'snjs';
 import template from '%/tags.pug';
@@ -107,9 +107,9 @@ class TagsPanelCtrl extends PureCtrl {
   /** @override */
   async onAppEvent(eventName) {
     super.onAppEvent(eventName);
-    if (eventName === ApplicationEvents.LocalDataIncrementalLoad) {
+    if (eventName === ApplicationEvent.LocalDataIncrementalLoad) {
       this.reloadNoteCounts();
-    } else if (eventName === ApplicationEvents.SyncStatusChanged) {
+    } else if (eventName === ApplicationEvent.SyncStatusChanged) {
       const syncStatus = this.application.getSyncStatus();
       const stats = syncStatus.getStats();
       if (stats.downloadCount > 0) {