Chore: Force threads to be inactive when the dialog hides (#424)

* Chore: Force threads to be inactive when the dialog hides and make sure threads are properly deleted on mobile
box · Oct 4, 2017 · 90048ec · 90048ec
1 parent 04d3cc7
commit 90048ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lib/annotations/AnnotationThread.js b/src/lib/annotations/AnnotationThread.js
@@ -125,6 +125,7 @@ class AnnotationThread extends EventEmitter {
      */
     hideDialog() {
         if (this.dialog) {
+            this.state = STATES.inactive;
             this.dialog.hide();
         }
     }
@@ -210,8 +211,8 @@ class AnnotationThread extends EventEmitter {
             // If this annotation was the last one in the thread, destroy the thread
         } else if (this.annotations.length === 0 || annotatorUtil.isPlainHighlight(this.annotations)) {
             if (this.isMobile && this.dialog) {
-                this.dialog.removeAnnotation(annotationID);
                 this.dialog.hideMobileDialog();
+                this.dialog.removeAnnotation(annotationID);
             }
             this.destroy();
 

diff --git a/src/lib/annotations/__tests__/AnnotationThread-test.js b/src/lib/annotations/__tests__/AnnotationThread-test.js
@@ -121,6 +121,7 @@ describe('lib/annotations/AnnotationThread', () => {
         it('should hide the thread dialog', () => {
             stubs.dialogMock.expects('hide');
             thread.hideDialog();
+            expect(thread.state).equals(STATES.inactive);
         });
     });