Some AAM refactoring #5

cvat-ai · Sep 26, 2018 · d485381 · d485381
1 parent 6abbdc6
commit d485381
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/cvat/apps/engine/static/engine/js/shapeCollection.js b/cvat/apps/engine/static/engine/js/shapeCollection.js
@@ -768,7 +768,7 @@ class ShapeCollectionModel extends Listener {
     }
 
     get activeShape() {
-        return this._activeShape;
+        return this._activeAAMShape || this._activeShape;
     }
 
     get currentShapes() {
@@ -891,19 +891,19 @@ class ShapeCollectionController {
     }
 
     switchActiveOccluded() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchActiveOccluded();
         }
     }
 
     switchAllLock() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchAllLock();
         }
     }
 
     switchActiveLock() {
-        if (!window.cvat.mode) {
+        if (!window.cvat.mode || window.cvat.mode === 'aam') {
             this._model.switchActiveLock();
         }
     }
@@ -1291,6 +1291,11 @@ class ShapeCollectionView {
                 content.append(shape);
             }
 
+            let mask = $('#outsideRect');
+            if (mask.length) {
+                mask.appendTo(mask.parent());
+            }
+
             let texts = content.find('.shapeText');
             for (let text of texts) {
                 content.append(text);