From 48c7010f4ea8daafd30e5650625c377affa0cecd Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 27 Apr 2020 18:10:37 -0400
Subject: Frontend refactor (part 1) (#484)

* Remove _getVisualViewportScale

* Use super's mouse event listener definitions

* Remove redundant override

* Remove getTouchEventListeners override

* Rename Display.onSearchClear to onEscape

* Change onSearchClear to clearSelection and use an event

* Update how text is marked for selection and deselection

* Replace onError with yomichan.logError

* Update setEnabled to refresh all event listeners
---
 ext/bg/js/search-query-parser.js          | 25 +++----------------------
 ext/bg/js/search.js                       |  2 +-
 ext/bg/js/settings/popup-preview-frame.js |  2 +-
 3 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 0001c9ff..3215f8e4 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -44,12 +44,7 @@ class QueryParser extends TextScanner {
         await this.queryParserGenerator.prepare();
     }
 
-    onError(error) {
-        yomichan.logError(error);
-    }
-
-    onClick(e) {
-        super.onClick(e);
+    onClick2(e) {
         this.searchAt(e.clientX, e.clientY, 'click');
     }
 
@@ -84,22 +79,8 @@ class QueryParser extends TextScanner {
 
     getMouseEventListeners() {
         return [
-            [this.node, 'click', this.onClick.bind(this)],
-            [this.node, 'mousedown', this.onMouseDown.bind(this)],
-            [this.node, 'mousemove', this.onMouseMove.bind(this)],
-            [this.node, 'mouseover', this.onMouseOver.bind(this)],
-            [this.node, 'mouseout', this.onMouseOut.bind(this)]
-        ];
-    }
-
-    getTouchEventListeners() {
-        return [
-            [this.node, 'auxclick', this.onAuxClick.bind(this)],
-            [this.node, 'touchstart', this.onTouchStart.bind(this)],
-            [this.node, 'touchend', this.onTouchEnd.bind(this)],
-            [this.node, 'touchcancel', this.onTouchCancel.bind(this)],
-            [this.node, 'touchmove', this.onTouchMove.bind(this), {passive: false}],
-            [this.node, 'contextmenu', this.onContextMenu.bind(this)]
+            ...super.getMouseEventListeners(),
+            [this.node, 'click', this.onClick2.bind(this)]
         ];
     }
 
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index cbd7b562..b7d2eed8 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -125,7 +125,7 @@ class DisplaySearch extends Display {
         yomichan.logError(error);
     }
 
-    onSearchClear() {
+    onEscape() {
         if (this.query === null) {
             return;
         }
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 05a2a41b..e73c04a0 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -69,7 +69,7 @@ class SettingsPopupPreview {
 
         this.frontend.getOptionsContext = async () => this.optionsContext;
         this.frontend.setEnabled = () => {};
-        this.frontend.onSearchClear = () => {};
+        this.frontend.clearSelection = () => {};
 
         await this.frontend.prepare();
 
-- 
cgit v1.2.3