Merge pull request #192 from DigitalSlideArchive/active-annotation-hi…

…ghlight Fix highlighting the active annotation.
DigitalSlideArchive · Jun 29, 2022 · 053f777 · 053f777
2 parents 40338a5 + 61b6a42
commit 053f777
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/histomicsui/web_client/panels/AnnotationSelector.js b/histomicsui/web_client/panels/AnnotationSelector.js
@@ -329,7 +329,7 @@ var AnnotationSelector = Panel.extend({
         }
         model.set('displayed', true);
 
-        if (numElements > MAX_ELEMENTS_LIST_LENGTH) {
+        if (numElements > MAX_ELEMENTS_LIST_LENGTH || model._pageElements) {
             events.trigger('g:alert', {
                 text: 'This annotation has too many elements to be edited.',
                 type: 'warning',

diff --git a/histomicsui/web_client/views/body/ImageView.js b/histomicsui/web_client/views/body/ImageView.js
@@ -1058,8 +1058,10 @@ var ImageView = View.extend({
             return;
         }
         this.activeAnnotation = model;
+        this.annotationSelector.$('.h-annotation').removeClass('h-active-annotation');
         this._removeDrawWidget();
         if (model) {
+            this.annotationSelector.$('.h-annotation[data-id="' + model.id + '"]').addClass('h-active-annotation');
             this.drawWidget = new DrawWidget({
                 parentView: this,
                 image: this.model,