From e9358997c03ee6ca2b5e9f26e8e416c8508c88e6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 13 Feb 2021 18:52:54 -0500
Subject: Move search mode (#1381)

* Move mode handling to SearchDisplayController

* Remove mode state info and handlers from Display
---
 ext/mixed/js/display.js | 58 -------------------------------------------------
 1 file changed, 58 deletions(-)

(limited to 'ext/mixed/js/display.js')

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index bfb5f8f7..8ddca54f 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -84,7 +84,6 @@ class Display extends EventDispatcher {
             getSearchContext: this._getSearchContext.bind(this),
             documentUtil: this._documentUtil
         });
-        this._mode = null;
         this._ankiFieldTemplates = null;
         this._ankiFieldTemplatesDefault = null;
         this._ankiNoteBuilder = new AnkiNoteBuilder(true);
@@ -138,10 +137,6 @@ class Display extends EventDispatcher {
             ['nextEntryDifferentDictionary',     () => { this._focusEntryWithDifferentDictionary(1, true); }],
             ['previousEntryDifferentDictionary', () => { this._focusEntryWithDifferentDictionary(-1, true); }]
         ]);
-        this.registerMessageHandlers([
-            ['setMode', {async: false, handler: this._onMessageSetMode.bind(this)}],
-            ['getMode', {async: false, handler: this._onMessageGetMode.bind(this)}]
-        ]);
         this.registerDirectMessageHandlers([
             ['setOptionsContext',  {async: false, handler: this._onMessageSetOptionsContext.bind(this)}],
             ['setContent',         {async: false, handler: this._onMessageSetContent.bind(this)}],
@@ -176,10 +171,6 @@ class Display extends EventDispatcher {
         this._updateQueryParser();
     }
 
-    get mode() {
-        return this._mode;
-    }
-
     get japaneseUtil() {
         return this._japaneseUtil;
     }
@@ -215,7 +206,6 @@ class Display extends EventDispatcher {
     async prepare() {
         // State setup
         const {documentElement} = document;
-        this._updateMode();
         const {browser} = await api.getEnvironmentInfo();
         this._browser = browser;
 
@@ -231,7 +221,6 @@ class Display extends EventDispatcher {
         this._queryParser.on('searched', this._onQueryParserSearch.bind(this));
         this._progressIndicatorVisible.on('change', this._onProgressIndicatorVisibleChanged.bind(this));
         yomichan.on('extensionUnloaded', this._onExtensionUnloaded.bind(this));
-        chrome.runtime.onMessage.addListener(this._onMessage.bind(this));
         api.crossFrame.registerHandlers([
             ['popupMessage', {async: 'dynamic', handler: this._onDirectMessage.bind(this)}]
         ]);
@@ -379,12 +368,6 @@ class Display extends EventDispatcher {
         }
     }
 
-    registerMessageHandlers(handlers) {
-        for (const [name, handlerInfo] of handlers) {
-            this._messageHandlers.set(name, handlerInfo);
-        }
-    }
-
     registerDirectMessageHandlers(handlers) {
         for (const [name, handlerInfo] of handlers) {
             this._directMessageHandlers.set(name, handlerInfo);
@@ -456,12 +439,6 @@ class Display extends EventDispatcher {
 
     // Message handlers
 
-    _onMessage({action, params}, sender, callback) {
-        const messageHandler = this._messageHandlers.get(action);
-        if (typeof messageHandler === 'undefined') { return false; }
-        return yomichan.invokeMessageHandler(messageHandler, params, callback, sender);
-    }
-
     _onDirectMessage(data) {
         data = this.authenticateMessageData(data);
         const {action, params} = data;
@@ -490,14 +467,6 @@ class Display extends EventDispatcher {
         yomichan.invokeMessageHandler(messageHandler, params, callback);
     }
 
-    _onMessageSetMode({mode}) {
-        this._setMode(mode, true);
-    }
-
-    _onMessageGetMode() {
-        return this._mode;
-    }
-
     _onMessageSetOptionsContext({optionsContext}) {
         this.setOptionsContext(optionsContext);
         this.searchLast();
@@ -1424,33 +1393,6 @@ class Display extends EventDispatcher {
         yomichan.trigger('closePopups');
     }
 
-    _updateMode() {
-        let mode = null;
-        try {
-            mode = sessionStorage.getItem('mode');
-        } catch (e) {
-            // Browsers can throw a SecurityError when cookie blocking is enabled.
-        }
-        this._setMode(mode, false);
-    }
-
-    _setMode(mode, save) {
-        if (mode === this._mode) { return; }
-        if (save) {
-            try {
-                if (mode === null) {
-                    sessionStorage.removeItem('mode');
-                } else {
-                    sessionStorage.setItem('mode', mode);
-                }
-            } catch (e) {
-                // Browsers can throw a SecurityError when cookie blocking is enabled.
-            }
-        }
-        this._mode = mode;
-        this.trigger('modeChange', {mode});
-    }
-
     async _getAnkiFieldTemplates(options) {
         let templates = options.anki.fieldTemplates;
         if (typeof templates === 'string') { return templates; }
-- 
cgit v1.2.3