Fix: Hide createHighlightDialog on page re-render (#31)

box · Nov 14, 2017 · 0b74717 · 0b74717
1 parent 08c180d
commit 0b74717
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/doc/DocAnnotator.js b/src/doc/DocAnnotator.js
@@ -331,6 +331,10 @@ class DocAnnotator extends Annotator {
                 thread.destroy();
             }
         });
+
+        if (this.createHighlightDialog && this.createHighlightDialog.isVisible) {
+            this.createHighlightDialog.hide();
+        }
     }
 
     /**

diff --git a/src/doc/__tests__/DocAnnotator-test.js b/src/doc/__tests__/DocAnnotator-test.js
@@ -584,6 +584,17 @@ describe('doc/DocAnnotator', () => {
 
             annotator.threads = {};
         });
+
+        it('should clear and hide createHighlightDialog on page render', () => {
+            annotator.createHighlightDialog = {
+                isVisible: true,
+                hide: () => {},
+                destroy: () => {}
+            };
+            const createMock = sandbox.mock(annotator.createHighlightDialog);
+            createMock.expects('hide');
+            annotator.renderAnnotationsOnPage(1);
+        });
     });
 
     describe('scaleAnnotationCanvases()', () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -331,6 +331,10 @@ class DocAnnotator extends Annotator { @@
                     thread.destroy();
                 }
             });
+            if (this.createHighlightDialog && this.createHighlightDialog.isVisible) {
+                this.createHighlightDialog.hide();
+            }
         }
         /**
@@ Expand Down @@