Chore: Guarding the removal of additional event listener

box · Jan 9, 2019 · 57fa2e8 · 57fa2e8
1 parent 847c75b
commit 57fa2e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Annotator.js b/src/Annotator.js
@@ -343,7 +343,10 @@ class Annotator extends EventEmitter {
      */
     unbindCustomListeners() {
         this.removeListener(ANNOTATOR_EVENT.scale, this.scaleAnnotations);
-        this.api.removeListener(ANNOTATOR_EVENT.error, this.handleServicesErrors);
+
+        if (this.api) {
+            this.api.removeListener(ANNOTATOR_EVENT.error, this.handleServicesErrors);
+        }
     }
 
     /**

diff --git a/src/controllers/AnnotationModeController.js b/src/controllers/AnnotationModeController.js
@@ -140,7 +140,10 @@ class AnnotationModeController extends EventEmitter {
         if (this.buttonEl) {
             this.buttonEl.removeEventListener('click', this.toggleMode);
         }
-        this.api.removeListener(CONTROLLER_EVENT.error, this.handleAPIErrors);
+
+        if (this.api) {
+            this.api.removeListener(CONTROLLER_EVENT.error, this.handleAPIErrors);
+        }
     }
 
     /**