Merge pull request #224 from toasted-nutbread/display-jquery-optimizations

Remove jQuery usage from Display.js

2 files changed, 14 insertions, 6 deletions

diff --git a/ext/fg/float.html b/ext/fg/float.html
index 465db589..52c7faa3 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -31,7 +31,6 @@
             </div>
         </div>
 
-        <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/wanakana.min.js"></script>
 
         <script src="/mixed/js/extension.js"></script>
@@ -41,6 +40,7 @@
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
         <script src="/mixed/js/display.js"></script>
+        <script src="/mixed/js/scroll.js"></script>
 
         <script src="/fg/js/float.js"></script>
 
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index fd7986b8..2e952efb 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -19,7 +19,7 @@
 
 class DisplayFloat extends Display {
     constructor() {
-        super($('#spinner'), $('#definitions'));
+        super(document.querySelector('#spinner'), document.querySelector('#definitions'));
         this.autoPlayAudioTimer = null;
         this.styleNode = null;
 
@@ -30,7 +30,7 @@ class DisplayFloat extends Display {
 
         this.dependencies = Object.assign({}, this.dependencies, {docRangeFromPoint, docSentenceExtract});
 
-        $(window).on('message', utilAsync(this.onMessage.bind(this)));
+        window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
     onError(error) {
@@ -42,8 +42,16 @@ class DisplayFloat extends Display {
     }
 
     onOrphaned() {
-        $('#definitions').hide();
-        $('#error-orphaned').show();
+        const definitions = document.querySelector('#definitions');
+        const errorOrphaned = document.querySelector('#error-orphaned');
+
+        if (definitions !== null) {
+            definitions.style.setProperty('display', 'none', 'important');
+        }
+
+        if (errorOrphaned !== null) {
+            errorOrphaned.style.setProperty('display', 'block', 'important');
+        }
     }
 
     onSearchClear() {
@@ -86,7 +94,7 @@ class DisplayFloat extends Display {
             }
         };
 
-        const {action, params} = e.originalEvent.data;
+        const {action, params} = e.data;
         const handler = handlers[action];
         if (handler) {
             handler(params);