Skip to content

Commit b3f8361

Browse files
authored
Merge pull request #284 from DigitalSlideArchive/deselect-on-transition
Deselect elements on image transition.
2 parents aab1209 + fe83e2f commit b3f8361

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

histomicsui/web_client/panels/AnnotationSelector.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ var AnnotationSelector = Panel.extend({
287287
// remove annotations that are displayed but have been deleted
288288
Object.keys(models).forEach((id) => {
289289
if (!this.collection.get(id) && models[id].get('displayed')) {
290+
this._deselectAnnotationElements(models[id]);
290291
this.viewer.removeAnnotation(models[id]);
291292
}
292293
});

histomicsui/web_client/views/body/ImageView.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ var ImageView = View.extend({
324324
},
325325
openImage(id) {
326326
/* eslint-disable backbone/no-silent */
327+
this._resetSelection();
327328
this.model.clear({silent: true});
328329
delete this.model.parent;
329330
if (id) {
@@ -1487,10 +1488,10 @@ var ImageView = View.extend({
14871488
},
14881489

14891490
_resetSelection() {
1490-
if (this.viewerWidget._highlightAnnotation) {
1491+
if (this.viewerWidget && this.viewerWidget._highlightAnnotation) {
14911492
this.viewerWidget.highlightAnnotation();
14921493
}
1493-
if (this.selectedElements.length) {
1494+
if (this.selectedElements && this.selectedElements.length) {
14941495
this.selectedElements.reset();
14951496
}
14961497
},

0 commit comments

Comments
 (0)