cleanup

4 files changed, 18 insertions, 12 deletions

diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 582b6770..17cca613 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 59293239..22374f8b 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 class DisplayFloat extends Display {
     constructor() {
         super($('#spinner'), $('#definitions'));
-        $(window).on('message', e => this.onMessage(e));
+        $(window).on('message', utilAsync(this.onMessage.bind(this)));
     }
 
     onError(error) {
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index cc4d99c8..7d26f946 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -33,14 +33,14 @@ class Frontend {
         try {
             this.options = await apiOptionsGet();
 
-            window.addEventListener('message', e => this.onFrameMessage(e));
-            window.addEventListener('mousedown', e => this.onMouseDown(e));
-            window.addEventListener('mousemove', e => this.onMouseMove(e));
-            window.addEventListener('mouseover', e => this.onMouseOver(e));
-            window.addEventListener('mouseup', e => this.onMouseUp(e));
-            window.addEventListener('resize', e => this.onResize(e));
-
-            chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => this.onBgMessage(action, params, sender, callback));
+            window.addEventListener('message', this.onFrameMessage.bind(this));
+            window.addEventListener('mousedown', this.onMouseDown.bind(this));
+            window.addEventListener('mousemove', this.onMouseMove.bind(this));
+            window.addEventListener('mouseover', this.onMouseOver.bind(this));
+            window.addEventListener('mouseup', this.onMouseUp.bind(this));
+            window.addEventListener('resize', this.onResize.bind(this));
+
+            chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
         } catch (e) {
             this.onError(e);
         }
@@ -124,7 +124,7 @@ class Frontend {
         this.searchClear();
     }
 
-    onBgMessage(action, params, sender, callback) {
+    onBgMessage({action, params}, sender, callback) {
         const handlers = {
             optionsSet: options => {
                 this.options = options;
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index afa895ba..3faf3b47 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -17,6 +17,12 @@
  */
 
 
+function utilAsync(func) {
+    return function(...args) {
+        func.apply(this, args);
+    };
+}
+
 function utilInvoke(action, params={}) {
     return new Promise((resolve, reject) => {
         try {