From 94f5888961b78d0a3d18cfa4c3c0698394dea624 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Tue, 4 Feb 2020 14:22:02 +0100 Subject: [PATCH] eslint --fix: let to const --- app/assets/javascripts/controllers/root.js | 1 + .../javascripts/services/authManager.js | 10 ++++----- .../javascripts/services/componentManager.js | 2 +- .../javascripts/services/keyboardManager.js | 14 ++++++------ .../javascripts/services/migrationManager.js | 22 +++++++++---------- .../javascripts/services/modelManager.js | 14 ++++++------ .../javascripts/services/nativeExtManager.js | 18 +++++++-------- .../javascripts/services/passcodeManager.js | 14 ++++++------ .../javascripts/services/sessionHistory.js | 6 ++--- .../javascripts/services/themeManager.js | 12 +++++----- 10 files changed, 57 insertions(+), 56 deletions(-) diff --git a/app/assets/javascripts/controllers/root.js b/app/assets/javascripts/controllers/root.js index 8f9b11bba..a4f63d0a0 100644 --- a/app/assets/javascripts/controllers/root.js +++ b/app/assets/javascripts/controllers/root.js @@ -304,6 +304,7 @@ class RootCtrl { && this.authManager.user.email === email ) { /** Already signed in, return */ + // eslint-disable-next-line no-useless-return return; } else { /** Sign out */ diff --git a/app/assets/javascripts/services/authManager.js b/app/assets/javascripts/services/authManager.js index f52d53c5e..89485209f 100644 --- a/app/assets/javascripts/services/authManager.js +++ b/app/assets/javascripts/services/authManager.js @@ -104,9 +104,9 @@ export class AuthManager extends SFAuthManager { } async verifyAccountPassword(password) { - let authParams = await this.getAuthParams(); - let keys = await protocolManager.computeEncryptionKeysForUser(password, authParams); - let success = keys.mk === (await this.keys()).mk; + const authParams = await this.getAuthParams(); + const keys = await protocolManager.computeEncryptionKeysForUser(password, authParams); + const success = keys.mk === (await this.keys()).mk; return success; } @@ -115,8 +115,8 @@ export class AuthManager extends SFAuthManager { return false; } - let latest = protocolManager.version(); - let updateAvailable = await this.protocolVersion() !== latest; + const latest = protocolManager.version(); + const updateAvailable = await this.protocolVersion() !== latest; if(updateAvailable !== this.securityUpdateAvailable) { this.securityUpdateAvailable = updateAvailable; this.$rootScope.$broadcast("security-update-status-changed"); diff --git a/app/assets/javascripts/services/componentManager.js b/app/assets/javascripts/services/componentManager.js index 85bf2b6ce..ba79f9024 100644 --- a/app/assets/javascripts/services/componentManager.js +++ b/app/assets/javascripts/services/componentManager.js @@ -39,7 +39,7 @@ export class ComponentManager extends SNComponentManager { } presentPermissionsDialog(dialog) { - let scope = this.$rootScope.$new(true); + const scope = this.$rootScope.$new(true); scope.permissionsString = dialog.permissionsString; scope.component = dialog.component; scope.callback = dialog.callback; diff --git a/app/assets/javascripts/services/keyboardManager.js b/app/assets/javascripts/services/keyboardManager.js index a3bd4575e..38d98cd79 100644 --- a/app/assets/javascripts/services/keyboardManager.js +++ b/app/assets/javascripts/services/keyboardManager.js @@ -29,10 +29,10 @@ export class KeyboardManager { } modifiersForEvent(event) { - let eventModifiers = KeyboardManager.AllModifiers.filter((modifier) => { + const eventModifiers = KeyboardManager.AllModifiers.filter((modifier) => { // For a modifier like ctrlKey, must check both event.ctrlKey and event.key. // That's because on keyup, event.ctrlKey would be false, but event.key == Control would be true. - let matches = ( + const matches = ( ((event.ctrlKey || event.key == KeyboardManager.KeyModifierCtrl) && modifier === KeyboardManager.KeyModifierCtrl) || ((event.metaKey || event.key == KeyboardManager.KeyModifierMeta) && modifier === KeyboardManager.KeyModifierMeta) || ((event.altKey || event.key == KeyboardManager.KeyModifierAlt) && modifier === KeyboardManager.KeyModifierAlt) || @@ -46,13 +46,13 @@ export class KeyboardManager { } eventMatchesKeyAndModifiers(event, key, modifiers = []) { - let eventModifiers = this.modifiersForEvent(event); + const eventModifiers = this.modifiersForEvent(event); if(eventModifiers.length != modifiers.length) { return false; } - for(let modifier of modifiers) { + for(const modifier of modifiers) { if(!eventModifiers.includes(modifier)) { return false; } @@ -69,7 +69,7 @@ export class KeyboardManager { } notifyObserver(event, keyEventType) { - for(let observer of this.observers) { + for(const observer of this.observers) { if(observer.element && event.target != observer.element) { continue; } @@ -87,7 +87,7 @@ export class KeyboardManager { } if(this.eventMatchesKeyAndModifiers(event, observer.key, observer.modifiers)) { - let callback = keyEventType == KeyboardManager.KeyEventDown ? observer.onKeyDown : observer.onKeyUp; + const callback = keyEventType == KeyboardManager.KeyEventDown ? observer.onKeyDown : observer.onKeyUp; if(callback) { callback(event); } @@ -104,7 +104,7 @@ export class KeyboardManager { } addKeyObserver({key, modifiers, onKeyDown, onKeyUp, element, elements, notElement, notElementIds}) { - let observer = {key, modifiers, onKeyDown, onKeyUp, element, elements, notElement, notElementIds}; + const observer = {key, modifiers, onKeyDown, onKeyUp, element, elements, notElement, notElementIds}; this.observers.push(observer); return observer; } diff --git a/app/assets/javascripts/services/migrationManager.js b/app/assets/javascripts/services/migrationManager.js index ee65613d0..c605f16a2 100644 --- a/app/assets/javascripts/services/migrationManager.js +++ b/app/assets/javascripts/services/migrationManager.js @@ -56,7 +56,7 @@ export class MigrationManager extends SFMigrationManager { } } - for(let editor of editors) { + for(const editor of editors) { this.modelManager.setItemToBeDeleted(editor); } @@ -82,10 +82,10 @@ export class MigrationManager extends SFMigrationManager { content_type: "SN|Component", handler: async (components) => { let hasChanges = false; - let notes = this.modelManager.validItemsForContentType("Note"); - for(let note of notes) { - for(let component of components) { - let clientData = note.getDomainDataItem(component.hosted_url, ComponentManager.ClientDataDomain); + const notes = this.modelManager.validItemsForContentType("Note"); + for(const note of notes) { + for(const component of components) { + const clientData = note.getDomainDataItem(component.hosted_url, ComponentManager.ClientDataDomain); if(clientData) { note.setDomainDataItem(component.uuid, clientData, ComponentManager.ClientDataDomain); note.setDomainDataItem(component.hosted_url, null, ComponentManager.ClientDataDomain); @@ -116,27 +116,27 @@ export class MigrationManager extends SFMigrationManager { content_type: "Note", handler: async (notes) => { - let needsSync = false; + const needsSync = false; let status = this.statusManager.addStatusFromString("Optimizing data..."); let dirtyCount = 0; - for(let note of notes) { + for(const note of notes) { if(!note.content) { continue; } - let references = note.content.references; + const references = note.content.references; // Remove any tag references, and transfer them to the tag if neccessary. - let newReferences = []; + const newReferences = []; - for(let reference of references) { + for(const reference of references) { if(reference.content_type != "Tag") { newReferences.push(reference); continue; } // is Tag content_type, we will not be adding this to newReferences - let tag = this.modelManager.findItem(reference.uuid); + const tag = this.modelManager.findItem(reference.uuid); if(tag && !tag.hasRelationshipWithItem(note)) { tag.addItemAsRelationship(note); this.modelManager.setItemDirty(tag, true); diff --git a/app/assets/javascripts/services/modelManager.js b/app/assets/javascripts/services/modelManager.js index c939f6470..d4e35b850 100644 --- a/app/assets/javascripts/services/modelManager.js +++ b/app/assets/javascripts/services/modelManager.js @@ -107,13 +107,13 @@ export class ModelManager extends SFModelManager { } notesMatchingSmartTag(tag) { - let contentTypePredicate = new SFPredicate("content_type", "=", "Note"); - let predicates = [contentTypePredicate, tag.content.predicate]; + const contentTypePredicate = new SFPredicate("content_type", "=", "Note"); + const predicates = [contentTypePredicate, tag.content.predicate]; if(!tag.content.isTrashTag) { - let notTrashedPredicate = new SFPredicate("content.trashed", "=", false); + const notTrashedPredicate = new SFPredicate("content.trashed", "=", false); predicates.push(notTrashedPredicate); } - let results = this.itemsMatchingPredicates(predicates); + const results = this.itemsMatchingPredicates(predicates); return results; } @@ -126,8 +126,8 @@ export class ModelManager extends SFModelManager { } emptyTrash() { - let notes = this.trashedItems(); - for(let note of notes) { + const notes = this.trashedItems(); + for(const note of notes) { this.setItemToBeDeleted(note); } } @@ -141,7 +141,7 @@ export class ModelManager extends SFModelManager { } getSmartTags() { - let userTags = this.validItemsForContentType("SN|SmartTag").sort((a, b) => { + const userTags = this.validItemsForContentType("SN|SmartTag").sort((a, b) => { return a.content.title < b.content.title ? -1 : 1; }); return this.systemSmartTags.concat(userTags); diff --git a/app/assets/javascripts/services/nativeExtManager.js b/app/assets/javascripts/services/nativeExtManager.js index 51d2a2e83..d6633d69d 100644 --- a/app/assets/javascripts/services/nativeExtManager.js +++ b/app/assets/javascripts/services/nativeExtManager.js @@ -24,8 +24,8 @@ export class NativeExtManager { resolveExtensionsManager() { - let contentTypePredicate = new SFPredicate("content_type", "=", "SN|Component"); - let packagePredicate = new SFPredicate("package_info.identifier", "=", this.extManagerId); + const contentTypePredicate = new SFPredicate("content_type", "=", "SN|Component"); + const packagePredicate = new SFPredicate("package_info.identifier", "=", this.extManagerId); this.singletonManager.registerSingleton([contentTypePredicate, packagePredicate], (resolvedSingleton) => { // Resolved Singleton @@ -45,7 +45,7 @@ export class NativeExtManager { } // Handle addition of SN|ExtensionRepo permission - let permission = resolvedSingleton.content.permissions.find((p) => p.name == "stream-items"); + const permission = resolvedSingleton.content.permissions.find((p) => p.name == "stream-items"); if(!permission.content_types.includes("SN|ExtensionRepo")) { permission.content_types.push("SN|ExtensionRepo"); needsSync = true; @@ -57,13 +57,13 @@ export class NativeExtManager { } }, (valueCallback) => { // Safe to create. Create and return object. - let url = window._extensions_manager_location; + const url = window._extensions_manager_location; if(!url) { console.error("window._extensions_manager_location must be set."); return; } - let packageInfo = { + const packageInfo = { name: "Extensions", identifier: this.extManagerId }; @@ -106,8 +106,8 @@ export class NativeExtManager { resolveBatchManager() { - let contentTypePredicate = new SFPredicate("content_type", "=", "SN|Component"); - let packagePredicate = new SFPredicate("package_info.identifier", "=", this.batchManagerId); + const contentTypePredicate = new SFPredicate("content_type", "=", "SN|Component"); + const packagePredicate = new SFPredicate("package_info.identifier", "=", this.batchManagerId); this.singletonManager.registerSingleton([contentTypePredicate, packagePredicate], (resolvedSingleton) => { // Resolved Singleton @@ -132,13 +132,13 @@ export class NativeExtManager { } }, (valueCallback) => { // Safe to create. Create and return object. - let url = window._batch_manager_location; + const url = window._batch_manager_location; if(!url) { console.error("window._batch_manager_location must be set."); return; } - let packageInfo = { + const packageInfo = { name: "Batch Manager", identifier: this.batchManagerId }; diff --git a/app/assets/javascripts/services/passcodeManager.js b/app/assets/javascripts/services/passcodeManager.js index 964b2aa30..07dc39fa0 100644 --- a/app/assets/javascripts/services/passcodeManager.js +++ b/app/assets/javascripts/services/passcodeManager.js @@ -53,7 +53,7 @@ export class PasscodeManager { } notifiyVisibilityObservers(visible) { - for(let callback of this.visibilityObservers) { + for(const callback of this.visibilityObservers) { callback(visible); } } @@ -63,7 +63,7 @@ export class PasscodeManager { } async getAutoLockInterval() { - let interval = await this.storageManager.getItem(PasscodeManager.AutoLockIntervalKey, StorageManager.FixedEncrypted); + const interval = await this.storageManager.getItem(PasscodeManager.AutoLockIntervalKey, StorageManager.FixedEncrypted); if(interval) { return JSON.parse(interval); } else { @@ -88,7 +88,7 @@ export class PasscodeManager { async verifyPasscode(passcode) { return new Promise(async (resolve, reject) => { var params = this.passcodeAuthParams(); - let keys = await protocolManager.computeEncryptionKeysForUser(passcode, params); + const keys = await protocolManager.computeEncryptionKeysForUser(passcode, params); if(keys.pw !== params.hash) { resolve(false); } else { @@ -118,8 +118,8 @@ export class PasscodeManager { var uuid = protocolManager.crypto.generateUUIDSync(); protocolManager.generateInitialKeysAndAuthParamsForUser(uuid, passcode).then((results) => { - let keys = results.keys; - let authParams = results.authParams; + const keys = results.keys; + const authParams = results.authParams; authParams.hash = keys.pw; this._keys = keys; @@ -264,8 +264,8 @@ export class PasscodeManager { // Use a timeout if possible, but if the computer is put to sleep, timeouts won't work. // Need to set a date as backup. this.lockAfterDate does not need to be persisted, as // living in memory seems sufficient. If memory is cleared, then the application will lock anyway. - let addToNow = (seconds) => { - let date = new Date(); + const addToNow = (seconds) => { + const date = new Date(); date.setSeconds(date.getSeconds() + seconds); return date; }; diff --git a/app/assets/javascripts/services/sessionHistory.js b/app/assets/javascripts/services/sessionHistory.js index 2460d161c..a0f912cd4 100644 --- a/app/assets/javascripts/services/sessionHistory.js +++ b/app/assets/javascripts/services/sessionHistory.js @@ -21,9 +21,9 @@ export class SessionHistory extends SFSessionHistoryManager { }); var keyRequestHandler = async () => { - let offline = authManager.offline(); - let auth_params = offline ? passcodeManager.passcodeAuthParams() : await authManager.getAuthParams(); - let keys = offline ? passcodeManager.keys() : await authManager.keys(); + const offline = authManager.offline(); + const auth_params = offline ? passcodeManager.passcodeAuthParams() : await authManager.getAuthParams(); + const keys = offline ? passcodeManager.keys() : await authManager.keys(); return { keys: keys, diff --git a/app/assets/javascripts/services/themeManager.js b/app/assets/javascripts/services/themeManager.js index 17af57490..b9d38c4b2 100644 --- a/app/assets/javascripts/services/themeManager.js +++ b/app/assets/javascripts/services/themeManager.js @@ -123,12 +123,12 @@ export class ThemeManager { } async cacheThemes() { - let mapped = await Promise.all(this.activeThemes.map(async (theme) => { - let transformer = new SFItemParams(theme); - let params = await transformer.paramsForLocalStorage(); + const mapped = await Promise.all(this.activeThemes.map(async (theme) => { + const transformer = new SFItemParams(theme); + const params = await transformer.paramsForLocalStorage(); return params; })); - let data = JSON.stringify(mapped); + const data = JSON.stringify(mapped); return this.storageManager.setItem(ThemeManager.CachedThemesKey, data, StorageManager.Fixed); } @@ -137,9 +137,9 @@ export class ThemeManager { } getCachedThemes() { - let cachedThemes = this.storageManager.getItemSync(ThemeManager.CachedThemesKey, StorageManager.Fixed); + const cachedThemes = this.storageManager.getItemSync(ThemeManager.CachedThemesKey, StorageManager.Fixed); if (cachedThemes) { - let parsed = JSON.parse(cachedThemes); + const parsed = JSON.parse(cachedThemes); return parsed.map((theme) => { return new SNTheme(theme); });