renamed Listener() to Event()

src/public/javascripts/services/app_context.js

@@ -83,7 +83,7 @@ class AppContext extends Component {
         return $(el).closest(".component").prop('component');
     }
 
-    async protectedSessionStartedListener() {
+    async protectedSessionStartedEvent() {
         await treeCache.loadInitialTree();
 
         this.triggerEvent('treeCacheReloaded');

src/public/javascripts/services/entrypoints.js

@@ -29,13 +29,13 @@ export default class Entrypoints extends Component {
         });
     }
 
-    openDevToolsListener() {
+    openDevToolsEvent() {
         if (utils.isElectron()) {
             require('electron').remote.getCurrentWindow().toggleDevTools();
         }
     }
 
-    findInTextListener() {
+    findInTextEvent() {
         if (!utils.isElectron()) {
             return;
         }
@@ -58,7 +58,7 @@ export default class Entrypoints extends Component {
 
 
 
-    async createNoteIntoDayNoteListener() {
+    async createNoteIntoDayNoteEvent() {
         const todayNote = await dateNoteService.getTodayNote();
 
         const {note} = await server.post(`notes/${todayNote.noteId}/children?target=into`, {
@@ -77,7 +77,7 @@ export default class Entrypoints extends Component {
         appContext.triggerEvent('focusAndSelectTitle');
     }
 
-    async toggleNoteHoistingListener() {
+    async toggleNoteHoistingEvent() {
         const note = appContext.tabManager.getActiveTabNote();
 
         const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
@@ -93,11 +93,11 @@ export default class Entrypoints extends Component {
         }
     }
 
-    copyWithoutFormattingListener() {
+    copyWithoutFormattingEvent() {
         utils.copySelectionToClipboard();
     }
 
-    toggleFullscreenListener() {
+    toggleFullscreenEvent() {
         if (utils.isElectron()) {
             const win = require('electron').remote.getCurrentWindow();
 
@@ -111,7 +111,7 @@ export default class Entrypoints extends Component {
         }
     }
 
-    toggleZenModeListener() {
+    toggleZenModeEvent() {
         if (!this.zenModeActive) {
             $(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
             $("#container").addClass("zen-mode");
@@ -125,11 +125,11 @@ export default class Entrypoints extends Component {
         }
     }
 
-    reloadFrontendAppListener() {
+    reloadFrontendAppEvent() {
         utils.reloadApp();
     }
 
-    logoutListener() {
+    logoutEvent() {
         const $logoutForm = $('<form action="logout" method="POST">')
             .append($(`<input type="hidden" name="_csrf" value="${glob.csrfToken}"/>`));
 
@@ -137,27 +137,27 @@ export default class Entrypoints extends Component {
         $logoutForm.trigger('submit');
     }
 
-    showOptionsListener() {
+    showOptionsEvent() {
         import("../dialogs/options.js").then(d => d.showDialog())
     }
 
-    showHelpListener() {
+    showHelpEvent() {
         import("../dialogs/help.js").then(d => d.showDialog())
     }
 
-    showSQLConsoleListener() {
+    showSQLConsoleEvent() {
         import("../dialogs/sql_console.js").then(d => d.showDialog())
     }
 
-    showBackendLogListener() {
+    showBackendLogEvent() {
         import("../dialogs/backend_log.js").then(d => d.showDialog())
     }
 
-    backInNoteHistoryListener() {
+    backInNoteHistoryEvent() {
         window.history.back();
     }
 
-    forwardInNoteHistoryListener() {
+    forwardInNoteHistoryEvent() {
         window.history.forward();
     }
 }

src/public/javascripts/services/spell_check.js

@@ -41,7 +41,7 @@ export async function initSpellCheck() {
         });
     });
 
-    new ContextMenuListener(async (info) => {
+    new ContextMenuEvent(async (info) => {
         await contextMenuBuilder.showPopupMenu(info);
     });
 }

src/public/javascripts/services/tab_context.js

@@ -98,7 +98,7 @@ class TabContext extends Component {
         }
     }
 
-    async entitiesReloadedListener({loadResults}) {
+    async entitiesReloadedEvent({loadResults}) {
         if (loadResults.isNoteReloaded(this.noteId)) {
             const note = await treeCache.getNote(this.noteId);
 

src/public/javascripts/services/tab_manager.js

@@ -99,7 +99,7 @@ export default class TabManager extends Component {
         });
     }
 
-    tabNoteSwitchedListener({tabId}) {
+    tabNoteSwitchedEvent({tabId}) {
         if (tabId === this.activeTabId) {
             this.setCurrentNotePathToHash();
         }
@@ -228,7 +228,7 @@ export default class TabManager extends Component {
             this.openAndActivateEmptyTab();
         }
         else {
-            this.activateNextTabListener();
+            this.activateNextTabEvent();
         }
 
         this.children = this.children.filter(tc => tc.tabId !== tabId);
@@ -238,7 +238,7 @@ export default class TabManager extends Component {
         this.tabsUpdate.scheduleUpdate();
     }
 
-    tabReorderListener({tabIdsInOrder}) {
+    tabReorderEvent({tabIdsInOrder}) {
         const order = {};
 
         for (const i in tabIdsInOrder) {
@@ -250,39 +250,39 @@ export default class TabManager extends Component {
         this.tabsUpdate.scheduleUpdate();
     }
 
-    activateNextTabListener() {
+    activateNextTabEvent() {
         const oldIdx = this.tabContexts.findIndex(tc => tc.tabId === this.activeTabId);
         const newActiveTabId = this.tabContexts[oldIdx === this.tabContexts.length - 1 ? 0 : oldIdx + 1].tabId;
 
         this.activateTab(newActiveTabId);
     }
 
-    activatePreviousTabListener() {
+    activatePreviousTabEvent() {
         const oldIdx = this.tabContexts.findIndex(tc => tc.tabId === this.activeTabId);
         const newActiveTabId = this.tabContexts[oldIdx === 0 ? this.tabContexts.length - 1 : oldIdx - 1].tabId;
 
         this.activateTab(newActiveTabId);
     }
 
-    closeActiveTabListener() {
+    closeActiveTabEvent() {
         this.removeTab(this.activeTabId);
     }
 
-    beforeUnloadListener() {
+    beforeUnloadEvent() {
         this.tabsUpdate.updateNowIfNecessary();
     }
 
-    openNewTabListener() {
+    openNewTabEvent() {
         this.openAndActivateEmptyTab();
     }
 
-    async removeAllTabsListener() {
+    async removeAllTabsEvent() {
         for (const tabIdToRemove of this.tabContexts.map(tc => tc.tabId)) {
             await this.removeTab(tabIdToRemove);
         }
     }
 
-    async removeAllTabsExceptForThisListener({tabId}) {
+    async removeAllTabsExceptForThisEvent({tabId}) {
         for (const tabIdToRemove of this.tabContexts.map(tc => tc.tabId)) {
             if (tabIdToRemove !== tabId) {
                 await this.removeTab(tabIdToRemove);
@@ -290,7 +290,7 @@ export default class TabManager extends Component {
         }
     }
 
-    async hoistedNoteChangedListener({hoistedNoteId}) {
+    async hoistedNoteChangedEvent({hoistedNoteId}) {
         if (hoistedNoteId === 'root') {
             return;
         }

src/public/javascripts/services/zoom.js

@@ -33,15 +33,15 @@ export default class ZoomService extends Component {
         return require('electron').webFrame.getZoomFactor();
     }
 
-    zoomOutListener() {
+    zoomOutEvent() {
         this.setZoomFactorAndSave(this.getCurrentZoom() - 0.1);
     }
 
-    zoomInListener() {
+    zoomInEvent() {
         this.setZoomFactorAndSave(this.getCurrentZoom() + 0.1);
     }
 
-    setZoomFactorAndSaveListener({zoomFactor}) {
+    setZoomFactorAndSaveEvent({zoomFactor}) {
         this.setZoomFactorAndSave(zoomFactor);
     }
 }

src/public/javascripts/widgets/attributes.js

@@ -98,7 +98,7 @@ export default class AttributesWidget extends CollapsibleWidget {
         }
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (loadResults.getAttributes().find(attr => attr.noteId === this.noteId)) {
             this.refresh();
         }

src/public/javascripts/widgets/link_map.js

@@ -67,7 +67,7 @@ export default class LinkMapWidget extends CollapsibleWidget {
         }
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (loadResults.getAttributes().find(attr => attr.type === 'relation' && (attr.noteId === this.noteId || attr.value === this.noteId))) {
             this.refresh();
         }

src/public/javascripts/widgets/note_detail.js

@@ -164,7 +164,7 @@ export default class NoteDetailWidget extends TabAwareWidget {
         return type;
     }
 
-    async focusOnDetailListener({tabId}) {
+    async focusOnDetailEvent({tabId}) {
         if (this.tabContext.tabId === tabId) {
             await this.refresh();
 
@@ -173,19 +173,19 @@ export default class NoteDetailWidget extends TabAwareWidget {
         }
     }
 
-    async beforeNoteSwitchListener({tabId}) {
+    async beforeNoteSwitchEvent({tabId}) {
         if (this.isTab(tabId)) {
             await this.spacedUpdate.updateNowIfNecessary();
         }
     }
 
-    async beforeTabRemoveListener({tabId}) {
+    async beforeTabRemoveEvent({tabId}) {
         if (this.isTab(tabId)) {
             await this.spacedUpdate.updateNowIfNecessary();
         }
     }
 
-    async printActiveNoteListener() {
+    async printActiveNoteEvent() {
         if (!this.tabContext.isActive()) {
             return;
         }
@@ -203,11 +203,11 @@ export default class NoteDetailWidget extends TabAwareWidget {
         });
     }
 
-    hoistedNoteChangedListener() {
+    hoistedNoteChangedEvent() {
         this.refresh();
     }
 
-    async entitiesReloadedListener({loadResults}) {
+    async entitiesReloadedEvent({loadResults}) {
         // we should test what happens when the loaded note is deleted
 
         if (loadResults.isNoteContentReloaded(this.noteId, this.componentId)) {
@@ -215,11 +215,11 @@ export default class NoteDetailWidget extends TabAwareWidget {
         }
     }
 
-    beforeUnloadListener() {
+    beforeUnloadEvent() {
         this.spacedUpdate.updateNowIfNecessary();
     }
 
-    autoBookDisabledListener() {
+    autoBookDisabledEvent() {
         this.refresh();
     }
 

src/public/javascripts/widgets/note_info.js

@@ -67,7 +67,7 @@ export default class NoteInfoWidget extends CollapsibleWidget {
             .attr("title", note.mime);
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (loadResults.isNoteReloaded(this.noteId)) {
             this.refresh();
         }

src/public/javascripts/widgets/note_revisions.js

@@ -70,7 +70,7 @@ class NoteRevisionsWidget extends CollapsibleWidget {
         }
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (loadResults.hasNoteRevisionForNote(this.noteId)) {
             this.refresh();
         }

src/public/javascripts/widgets/note_title.js

@@ -54,25 +54,25 @@ export default class NoteTitleWidget extends TabAwareWidget {
         this.$noteTitle.prop("readonly", note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable());
     }
 
-    async beforeNoteSwitchListener({tabId}) {
+    async beforeNoteSwitchEvent({tabId}) {
         if (this.isTab(tabId)) {
             await this.spacedUpdate.updateNowIfNecessary();
         }
     }
 
-    async beforeTabRemoveListener({tabId}) {
+    async beforeTabRemoveEvent({tabId}) {
         if (this.isTab(tabId)) {
             await this.spacedUpdate.updateNowIfNecessary();
         }
     }
 
-    focusOnTitleListener() {
+    focusOnTitleEvent() {
         if (this.tabContext && this.tabContext.isActive()) {
             this.$noteTitle.trigger('focus');
         }
     }
 
-    focusAndSelectTitleListener() {
+    focusAndSelectTitleEvent() {
         if (this.tabContext && this.tabContext.isActive()) {
             this.$noteTitle
                 .trigger('focus')
@@ -80,7 +80,7 @@ export default class NoteTitleWidget extends TabAwareWidget {
         }
     }
 
-    beforeUnloadListener() {
+    beforeUnloadEvent() {
         this.spacedUpdate.updateNowIfNecessary();
     }
 }

src/public/javascripts/widgets/note_tree.js

@@ -33,7 +33,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
     constructor(appContext, parent) {
         super(appContext, parent);
 
-        window.glob.cutIntoNote = () => this.cutIntoNoteListener();
+        window.glob.cutIntoNote = () => this.cutIntoNoteEvent();
 
         this.tree = null;
     }
@@ -285,7 +285,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
     }
 
-    async scrollToActiveNoteListener() {
+    async scrollToActiveNoteEvent() {
         const activeContext = appContext.tabManager.getActiveTabContext();
 
         if (activeContext && activeContext.notePath) {
@@ -406,9 +406,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
         await this.tree.reload(notes);
     }
 
-    createTopLevelNoteListener() { noteCreateService.createNewTopLevelNote(); }
+    createTopLevelNoteEvent() { noteCreateService.createNewTopLevelNote(); }
 
-    collapseTreeListener() { this.collapseTree(); }
+    collapseTreeEvent() { this.collapseTree(); }
 
     isEnabled() {
         return this.tabContext && this.tabContext.isActive();
@@ -448,7 +448,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         toastService.showMessage("Saved search note refreshed.");
     }
 
-    async entitiesReloadedListener({loadResults}) {
+    async entitiesReloadedEvent({loadResults}) {
         const noteIdsToUpdate = new Set();
         const noteIdsToReload = new Set();
 
@@ -547,7 +547,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
     }
 
-    async createNoteAfterListener() {
+    async createNoteAfterEvent() {
         const node = this.getActiveNode();
         const parentNoteId = node.data.parentNoteId;
         const isProtected = await treeService.getParentProtectedStatus(node);
@@ -564,7 +564,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         });
     }
 
-    async createNoteIntoListener() {
+    async createNoteIntoEvent() {
         const node = this.getActiveNode();
 
         if (node) {
@@ -575,7 +575,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
     }
 
-    async cutIntoNoteListener() {
+    async cutIntoNoteEvent() {
         const node = this.getActiveNode();
 
         if (node) {
@@ -610,11 +610,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
     }
 
-    hoistedNoteChangedListener() {
+    hoistedNoteChangedEvent() {
         this.reloadTreeFromCache();
     }
 
-    treeCacheReloadedListener() {
+    treeCacheReloadedEvent() {
         this.reloadTreeFromCache();
     }
 

src/public/javascripts/widgets/search_box.js

@@ -66,7 +66,7 @@ export default class SearchBoxWidget extends BasicWidget {
         });
 
         this.$doSearchButton.on('click', () => this.doSearch()); // keep long form because of argument
-        this.$resetSearchButton.on('click', () => this.resetSearchListener());
+        this.$resetSearchButton.on('click', () => this.resetSearchEvent());
 
         this.$saveSearchButton.on('click', () => this.saveSearch());
 
@@ -120,10 +120,10 @@ export default class SearchBoxWidget extends BasicWidget {
             content: JSON.stringify({ searchString: searchString })
         });
 
-        this.resetSearchListener();
+        this.resetSearchEvent();
     }
 
-    showSearchListener() {
+    showSearchEvent() {
         utils.saveFocusedElement();
 
         this.$searchBox.slideDown();
@@ -142,32 +142,32 @@ export default class SearchBoxWidget extends BasicWidget {
         this.$searchInput.trigger('focus');
     }
 
-    hideSearchListener() {
+    hideSearchEvent() {
-        this.resetSearchListener();
+        this.resetSearchEvent();
 
         this.$searchBox.slideUp();
 
         this.triggerEvent('hideSearchResults');
     }
 
-    toggleSearchListener() {
+    toggleSearchEvent() {
         if (this.$searchBox.is(":hidden")) {
-            this.showSearchListener();
+            this.showSearchEvent();
         }
         else {
-            this.hideSearchListener();
+            this.hideSearchEvent();
         }
     }
 
-    searchNotesListener() {
+    searchNotesEvent() {
-        this.toggleSearchListener();
+        this.toggleSearchEvent();
     }
 
-    resetSearchListener() {
+    resetSearchEvent() {
         this.$searchInput.val("");
     }
 
-    searchInSubtreeListener({noteId}) {
+    searchInSubtreeEvent({noteId}) {
         noteId = noteId || appContext.tabManager.getActiveTabNoteId();
 
         this.toggle(true);

src/public/javascripts/widgets/search_results.js

@@ -39,7 +39,7 @@ export default class SearchResultsWidget extends BasicWidget {
         return this.$widget;
     }
 
-    async searchForResultsListener({searchText}) {
+    async searchForResultsEvent({searchText}) {
         this.toggle(true);
 
         const response = await server.get('search/' + encodeURIComponent(searchText));
@@ -68,7 +68,7 @@ export default class SearchResultsWidget extends BasicWidget {
         toastService.showMessage("Search finished successfully.");
     }
 
-    hideSearchResultsListener() {
+    hideSearchResultsEvent() {
         this.$searchResults.hide();
     }
 }

src/public/javascripts/widgets/side_pane_container.js

@@ -18,7 +18,7 @@ export default class SidePaneContainer extends FlexContainer {
         }
     }
 
-    sidebarVisibilityChangedListener({side, show}) {
+    sidebarVisibilityChangedEvent({side, show}) {
         if (this.side === side) {
             this.toggle(show);
 

src/public/javascripts/widgets/side_pane_toggles.js

@@ -68,7 +68,7 @@ export default class SidePaneToggles extends BasicWidget {
         this.triggerEvent('sidebarVisibilityChanged', {side, show});
     }
 
-    initialRenderCompleteListener() {
+    initialRenderCompleteEvent() {
         splitService.setupSplit(this.paneVisible.left, this.paneVisible.right);
     }
 }

src/public/javascripts/widgets/similar_notes.js

@@ -61,7 +61,7 @@ export default class SimilarNotesWidget extends CollapsibleWidget {
         this.$body.empty().append($list);
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (this.note && this.title !== this.note.title) {
             this.rendered = false;
 

src/public/javascripts/widgets/tab_aware_widget.js

@@ -2,7 +2,7 @@ import BasicWidget from "./basic_widget.js";
 import appContext from "../services/app_context.js";
 
 export default class TabAwareWidget extends BasicWidget {
-    setTabContextListener({tabContext}) {
+    setTabContextEvent({tabContext}) {
         /** @var {TabContext} */
         this.tabContext = tabContext;
 
@@ -29,7 +29,7 @@ export default class TabAwareWidget extends BasicWidget {
         return this.tabContext && this.tabContext.notePath;
     }
 
-    tabNoteSwitchedListener({tabId, notePath}) {
+    tabNoteSwitchedEvent({tabId, notePath}) {
         // if notePath does not match then the tabContext has been switched to another note in the mean time
         if (this.isTab(tabId) && this.notePath === notePath) {
             this.noteSwitched();
@@ -68,17 +68,17 @@ export default class TabAwareWidget extends BasicWidget {
 
     refreshWithNote(note, notePath) {}
 
-    activeTabChangedListener() {
+    activeTabChangedEvent() {
         this.tabContext = appContext.tabManager.getActiveTabContext();
 
         this.activeTabChanged();
     }
 
-    treeCacheReloadedListener() {
+    treeCacheReloadedEvent() {
         this.refresh();
     }
 
-    lazyLoadedListener() {
+    lazyLoadedEvent() {
         if (!this.tabContext) { // has not been loaded yet
             this.tabContext = appContext.tabManager.getActiveTabContext();
         }

src/public/javascripts/widgets/tab_caching_widget.js

@@ -48,7 +48,7 @@ export default class TabCachingWidget extends TabAwareWidget {
         widget.toggle(widget.isEnabled());
     }
 
-    tabRemovedListener({tabId}) {
+    tabRemovedEvent({tabId}) {
         const widget = this.widgets[tabId];
 
         if (widget) {

src/public/javascripts/widgets/type_widgets/text.js

@@ -215,7 +215,7 @@ export default class TextTypeWidget extends TypeWidget {
         });
     }
 
-    addTextToActiveEditorListener(text) {
+    addTextToActiveEditorEvent(text) {
         if (!this.isActive()) {
             return;
         }
@@ -244,7 +244,7 @@ export default class TextTypeWidget extends TypeWidget {
         return !selection.isCollapsed;
     }
 
-    async executeInActiveEditorListener({callback}) {
+    async executeInActiveEditorEvent({callback}) {
         if (!this.isActive()) {
             return;
         }

src/public/javascripts/widgets/what_links_here.js

@@ -50,7 +50,7 @@ export default class WhatLinksHereWidget extends CollapsibleWidget {
         this.$body.empty().append($list);
     }
 
-    entitiesReloadedListener({loadResults}) {
+    entitiesReloadedEvent({loadResults}) {
         if (loadResults.getAttributes().find(attr => attr.type === 'relation' && attr.value === this.noteId)) {
             this.refresh();
         }