Merge pull request #234 from DigitalSlideArchive/missing-default-group

Fix setting the default group in one spot.

Author: manthey

histomicsui/web_client/panels/DrawWidget.js

@@ -110,6 +110,7 @@ var DrawWidget = Panel.extend({
                 elements: this.collection.models,
                 groups: this._groups,
                 style: this._style.id,
+                defaultGroup: this.parentView._defaultGroup,
                 highlighted: this._highlighted,
                 name,
                 opts: this._editOptions,
@@ -316,6 +317,7 @@ var DrawWidget = Panel.extend({
         this.$(`.h-element[data-id="${id}"]`).remove();
         this._skipRenderHTML = true;
         this.collection.remove(id, opts);
+        this.newElementDisplayIdStart = +(this.$el.find('.h-element>span.h-element-label[display_id]').last().attr('display_id') || 0);
     },
 
     /**

histomicsui/web_client/templates/panels/drawWidgetElement.pug

@@ -33,7 +33,7 @@ if elements.length
       }
     .h-element(data-id=element.id, class=classes)
       span.icon-cog.h-edit-element(title='Change style')
-      span.h-element-label(title=label) #{label}
+      span.h-element-label(title=label, display_id=displayId) #{label}
       span.icon-zoom-in.h-view-element(title='View annotation')
       span.icon-cancel.h-delete-element(title='Remove')
 if pixelmap

tests/web_client_specs/annotationSpec.js

@@ -311,7 +311,7 @@ girderTest.promise.done(function () {
                     return $('.h-elements-container .h-element').length === 2;
                 }, 'point to be created');
                 runs(function () {
-                    expect($('.h-elements-container .h-element:last .h-element-label').text()).toBe('default point 3');
+                    expect($('.h-elements-container .h-element:last .h-element-label').text()).toBe('default point 2');
                 });
                 checkAutoSave('drawn 1', 2, annotationInfo);
             });