From 83460bcdade28fe77908d3008444a23555f09487 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 4 Nov 2019 02:15:33 +0200
Subject: [PATCH] refactoring and optimization

---
 ext/fg/js/frontend.js   | 18 ++++++++++--------
 ext/mixed/js/display.js |  8 ++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 84d6af28..b9410f2c 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -497,19 +497,21 @@ class Frontend {
     }
 
     static isMouseButton(button, mouseEvent) {
-        if (['mouseup', 'mousedown', 'click'].includes(mouseEvent.type)) {
-            switch (button) {
+        switch (mouseEvent.type) {
+            case 'mouseup':
+            case 'mousedown':
+            case 'click': switch (button) {
                 case 'primary': return mouseEvent.button === 0;
                 case 'secondary': return mouseEvent.button === 2;
                 case 'auxiliary': return mouseEvent.button === 1;
                 default: return false;
             }
-        }
-        switch (button) {
-            case 'primary': return (mouseEvent.buttons & 0x1) !== 0x0;
-            case 'secondary': return (mouseEvent.buttons & 0x2) !== 0x0;
-            case 'auxiliary': return (mouseEvent.buttons & 0x4) !== 0x0;
-            default: return false;
+            default: switch (button) {
+                case 'primary': return (mouseEvent.buttons & 0x1) !== 0x0;
+                case 'secondary': return (mouseEvent.buttons & 0x2) !== 0x0;
+                case 'auxiliary': return (mouseEvent.buttons & 0x4) !== 0x0;
+                default: return false;
+            }
         }
     }
 }
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 81072957..6d992897 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -82,7 +82,7 @@ class Display {
         }
     }
 
-    onGlossaryMousedown(e) {
+    onGlossaryMouseDown(e) {
         if (Frontend.isMouseButton('primary', e)) {
             this.clickScanPrevent = false;
         }
@@ -92,7 +92,7 @@ class Display {
         this.clickScanPrevent = true;
     }
 
-    onGlossaryMouseup(e) {
+    onGlossaryMouseUp(e) {
         if (!this.clickScanPrevent && Frontend.isMouseButton('primary', e)) {
             this.onTermLookup(e);
         }
@@ -269,8 +269,8 @@ class Display {
             this.addEventListeners('.kanji-link', 'click', this.onKanjiLookup.bind(this));
             this.addEventListeners('.source-term', 'click', this.onSourceTermView.bind(this));
             if (this.options.scanning.enablePopupSearch) {
-                this.addEventListeners('.glossary-item', 'mouseup', this.onGlossaryMouseup.bind(this));
-                this.addEventListeners('.glossary-item', 'mousedown', this.onGlossaryMousedown.bind(this));
+                this.addEventListeners('.glossary-item', 'mouseup', this.onGlossaryMouseUp.bind(this));
+                this.addEventListeners('.glossary-item', 'mousedown', this.onGlossaryMouseDown.bind(this));
                 this.addEventListeners('.glossary-item', 'mousemove', this.onGlossaryMouseMove.bind(this));
             }
         } else {