Fix: Re-showing viewer controls on 'annotationmodeexit' (#323)

box · Aug 18, 2017 · 5900ece · 5900ece
1 parent 5dc3247
commit 5900ece
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -727,10 +727,7 @@ class BaseViewer extends EventEmitter {
                 }
                 break;
             case ANNOTATION_MODE_EXIT:
-                if (!this.annotator.isInAnnotationMode(ANNOTATION_TYPE_POINT)) {
-                    this.enableViewerControls();
-                }
-
+                this.enableViewerControls();
                 this.emit('notificationhide');
                 break;
             case 'annotationerror':

diff --git a/src/lib/viewers/__tests__/BaseViewer-test.js b/src/lib/viewers/__tests__/BaseViewer-test.js
@@ -857,19 +857,8 @@ describe('lib/viewers/BaseViewer', () => {
             expect(base.emit).to.be.calledWith('notificationshow', sinon.match.string);
         });
 
-        it('should hide notification on annotationmodeexit', () => {
+        it('should enable controls and hide notification on annotationmodeexit', () => {
             sandbox.stub(base, 'enableViewerControls');
-            stubs.isInAnnotationMode.returns(true);
-            base.handleAnnotatorNotifications({
-                event: ANNOTATION_MODE_EXIT
-            });
-            expect(base.enableViewerControls).to.not.be.called;
-            expect(base.emit).to.be.calledWith('notificationhide');
-        });
-
-        it('should enable controls if not in point annotation mode on annotationmodeexit', () => {
-            sandbox.stub(base, 'enableViewerControls');
-            stubs.isInAnnotationMode.returns(false);
             base.handleAnnotatorNotifications({
                 event: ANNOTATION_MODE_EXIT
             });