Fixes #73

annotorious · Jul 23, 2021 · 5318514 · 5318514
1 parent 1f98a43
commit 5318514
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/public/index.html b/public/index.html
@@ -84,7 +84,7 @@
         });
 
         var modeBtn = document.getElementById('mode');
-        modeBtn.addEventListener('click', function() {             
+        modeBtn.addEventListener('click', function() {     
           if (modeBtn.innerHTML == 'MODE: VIEW') {
             modeBtn.innerHTML = 'MODE: ANNOTATE';
             anno.setDrawingEnabled(true);

diff --git a/src/OSDAnnotationLayer.js b/src/OSDAnnotationLayer.js
@@ -411,7 +411,7 @@ export default class OSDAnnotationLayer extends EventEmitter {
       this.scaleFormatterElements(this.selectedShape.element);
 
       this.selectedShape.element.annotation = annotation;     
-      this.selectedShape.element.addEventListener(() =>
+      this.selectedShape.element.addEventListener('click', () =>
         this.emit('clickAnnotation', annotation, this.selectedShape.element));
 
       // Disable normal OSD nav

diff --git a/src/OpenSeadragonAnnotator.jsx b/src/OpenSeadragonAnnotator.jsx
@@ -75,9 +75,9 @@ export default class OpenSeadragonAnnotator extends Component {
   handleStartSelect = pt =>
     this.props.onSelectionStarted(pt);
 
-  handleSelect = evt => {
+  handleSelect = (evt, skipEvent) => {
     this.state.editorDisabled ?
-      this.onHeadlessSelect(evt) : this.onNormalSelect(evt);
+      this.onHeadlessSelect(evt, skipEvent) : this.onNormalSelect(evt, skipEvent);
   }
 
   onNormalSelect = (evt, skipEvent) => {
@@ -127,12 +127,12 @@ export default class OpenSeadragonAnnotator extends Component {
     }
   }
 
-  onHeadlessSelect = evt => {
+  onHeadlessSelect = (evt, skipEvent) => {
     // When in headless mode, changing selection acts as 'Ok' - changes
     // to the previous annotation are stored! (In normal mode, selection
     // acts as 'Cancel'.)
     this.saveSelected().then(() =>  {
-      this.onNormalSelect(evt);
+      this.onNormalSelect(evt, skipEvent);
 
       const { annotation } = evt;
 
@@ -324,7 +324,7 @@ export default class OpenSeadragonAnnotator extends Component {
     const selected = this.annotationLayer.selectAnnotation(arg, true);
 
     if (selected) { 
-      this.handleSelect(selected);
+      this.handleSelect(selected, true);
       return selected.annotation.clone();
     } else {
       this.clearState(); // Deselect