Chore: Remove autobind from BaseViewer (#502)

box · Nov 21, 2017 · 6d534be · 6d534be
1 parent 79b4576
commit 6d534be
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -1,6 +1,5 @@
 import 'box-annotations/lib/Annotator.scss';
 import BoxAnnotations from 'box-annotations/lib/BoxAnnotations';
-import autobind from 'autobind-decorator';
 import EventEmitter from 'events';
 import debounce from 'lodash.debounce';
 import cloneDeep from 'lodash.clonedeep';
@@ -54,7 +53,6 @@ const ANNOTATOR_EVENT = {
     scale: 'scaleannotations'
 };
 
-@autobind
 class BaseViewer extends EventEmitter {
     /** @property {Controls} - UI used to interact with the document in the viewer */
     controls;
@@ -106,6 +104,18 @@ class BaseViewer extends EventEmitter {
         this.repStatuses = [];
         this.isMobile = Browser.isMobile();
         this.hasTouch = Browser.hasTouch();
+
+        // Bind context for callbacks
+        this.resetLoadTimeout = this.resetLoadTimeout.bind(this);
+        this.preventDefault = this.preventDefault.bind(this);
+        this.debouncedResizeHandler = this.debouncedResizeHandler.bind(this);
+        this.handleAssetError = this.handleAssetError.bind(this);
+        this.toggleFullscreen = this.toggleFullscreen.bind(this);
+        this.onFullscreenToggled = this.onFullscreenToggled.bind(this);
+        this.mobileZoomStartHandler = this.mobileZoomStartHandler.bind(this);
+        this.mobileZoomChangeHandler = this.mobileZoomChangeHandler.bind(this);
+        this.mobileZoomEndHandler = this.mobileZoomEndHandler.bind(this);
+        this.handleAnnotatorEvents = this.handleAnnotatorEvents.bind(this);
     }
 
     /**
@@ -176,15 +186,10 @@ class BaseViewer extends EventEmitter {
 
         fullscreen.removeAllListeners();
         document.defaultView.removeEventListener('resize', this.debouncedResizeHandler);
-
-        if (this.preventDefault) {
-            this.containerEl.removeEventListener('contextmenu', this.preventDefault);
-            this.preventDefault = null;
-        }
-
         this.removeAllListeners();
 
         if (this.containerEl) {
+            this.containerEl.removeEventListener('contextmenu', this.preventDefault);
             this.containerEl.innerHTML = '';
         }
 
@@ -204,9 +209,11 @@ class BaseViewer extends EventEmitter {
      * @private
      * @return {Function} debounced resize handler
      */
-    debouncedResizeHandler = debounce(() => {
-        this.resize();
-    }, RESIZE_WAIT_TIME_IN_MILLIS);
+    debouncedResizeHandler() {
+        return debounce(() => {
+            this.resize();
+        }, RESIZE_WAIT_TIME_IN_MILLIS);
+    }
 
     /**
      * Loads content.
@@ -225,7 +232,7 @@ class BaseViewer extends EventEmitter {
      * @emits Error
      * @return {void}
      */
-    resetLoadTimeout = () => {
+    resetLoadTimeout() {
         clearTimeout(this.loadTimeoutId);
         /* istanbul ignore next */
         this.loadTimeoutId = setTimeout(() => {
@@ -237,18 +244,18 @@ class BaseViewer extends EventEmitter {
                 this.triggerError();
             }
         }, this.loadTimeout);
-    };
+    }
 
     /**
      * Triggers an error when an asset (static or representation) fails to load.
      *
      * @param {string} [err] - Optional error message
      * @return {void}
      */
-    handleAssetError = (err) => {
+    handleAssetError(err) {
         this.triggerError(err);
         this.destroyed = true;
-    };
+    }
 
     /**
      * Emits error event with refresh message.
@@ -356,7 +363,6 @@ class BaseViewer extends EventEmitter {
 
         const { permissions } = this.options.file;
         if (permissions && !permissions.can_download) {
-            this.preventDefault = (event) => event.preventDefault();
             this.containerEl.addEventListener('contextmenu', this.preventDefault);
         }
 
@@ -371,6 +377,16 @@ class BaseViewer extends EventEmitter {
         });
     }
 
+    /**
+     * Prevents default behavior.
+     *
+     * @param {Event} event - Some event
+     * @return {void}
+     */
+    preventDefault(event) {
+        event.preventDefault();
+    }
+
     /**
      * Enters or exits fullscreen
      *

diff --git a/src/lib/viewers/__tests__/BaseViewer-test.js b/src/lib/viewers/__tests__/BaseViewer-test.js
@@ -446,8 +446,7 @@ describe('lib/viewers/BaseViewer', () => {
 
             base.destroy();
 
-            expect(base.containerEl.removeEventListener).to.be.calledWith('contextmenu', sinon.match.func)
-            expect(base.preventDefault).to.be.null;
+            expect(base.containerEl.removeEventListener).to.be.calledWith('contextmenu', sinon.match.func);
         });
     });