From de268e73a613b963ea982f34ca7439d57694facd Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 17 Apr 2016 18:42:44 -0700
Subject: Rethinking dictionary switching

---
 ext/fg/css/popup.css | 20 --------------------
 ext/fg/js/client.js  | 37 ++++++++++++++-----------------------
 2 files changed, 14 insertions(+), 43 deletions(-)

(limited to 'ext/fg')

diff --git a/ext/fg/css/popup.css b/ext/fg/css/popup.css
index 4e8dc5f7..250b64f8 100644
--- a/ext/fg/css/popup.css
+++ b/ext/fg/css/popup.css
@@ -50,26 +50,6 @@ body {
     white-space:      nowrap;
 }
 
-.dictionary {
-    position:         fixed;
-    right:            0px;
-    bottom:           0px;
-}
-
-.dictionary a {
-    background-color: #333;
-    color:            #eee;
-    display:          inline-block;
-    font-size:        16px;
-    opacity:          0.75;
-    padding:          0.3em;
-    text-decoration:  none;
-}
-
-.dictionary a:hover {
-    opacity: 1.0;
-}
-
 ol {
     padding-left: 1.2em;
 }
diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js
index 271caa58..09bd7d14 100644
--- a/ext/fg/js/client.js
+++ b/ext/fg/js/client.js
@@ -19,11 +19,11 @@
 
 class Client {
     constructor() {
-        this.lastMosePos = null;
-        this.popupQuery  = '';
-        this.popupOffset = 10;
-        this.enabled     = false;
-        this.options     = null;
+        this.popupMousePos = null;
+        this.popupQuery    = '';
+        this.popupOffset   = 10;
+        this.enabled       = false;
+        this.options       = {};
 
         this.popup = document.createElement('iframe');
         this.popup.classList.add('yomichan-popup');
@@ -40,29 +40,28 @@ class Client {
         window.addEventListener('resize', (e) => this.hidePopup());
 
         getOptions((opts) => {
-            this.setDict('edict');
             this.setOptions(opts);
             getState((state) => this.setEnabled(state === 'enabled'));
         });
     }
 
     onKeyDown(e) {
-        if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) {
-            this.searchAtPoint(this.lastMousePos);
+        if (this.enabled && this.popupMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) {
+            this.searchAtPoint(this.popupMousePos);
         }
     }
 
     onMouseMove(e) {
-        this.lastMousePos = {x: e.clientX, y: e.clientY};
+        this.popupMousePos = {x: e.clientX, y: e.clientY};
         if (this.enabled && (e.shiftKey || e.which === 2)) {
-            this.searchAtPoint(this.lastMousePos);
+            this.searchAtPoint(this.popupMousePos);
         }
     }
 
     onMouseDown(e) {
-        this.lastMousePos = {x: e.clientX, y: e.clientY};
+        this.popupMousePos = {x: e.clientX, y: e.clientY};
         if (this.enabled && (e.shiftKey || e.which === 2)) {
-            this.searchAtPoint(this.lastMousePos);
+            this.searchAtPoint(this.popupMousePos);
         } else {
             this.hidePopup();
         }
@@ -82,12 +81,9 @@ class Client {
     }
 
     onFrameMessage(e) {
-        const {action, data} = e.data;
-        switch (action) {
-            case 'selectDict':
-                this.setDict(data);
-                break;
-        }
+        // const {action, data} = e.data;
+        // switch (action) {
+        // }
     }
 
     searchAtPoint(point) {
@@ -167,11 +163,6 @@ class Client {
     setOptions(opts) {
         this.options = opts;
     }
-
-    setDict(dict) {
-        this.dict = dict;
-        alert(dict);
-    }
 }
 
 window.yomiClient = new Client();
-- 
cgit v1.2.3