ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-21 09:47:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Layout] Deselect object after removal

Browse Source 
If the selected object is not in the composition, deselect it.

Add tests.

Fixes #1731
This commit is contained in:
Pegah Sarram 2017-10-02 13:49:12 -07:00
parent 9570f2f7a1
commit 00dc2875bf
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/layout/src/LayoutController.js
View File

@ -26,8 +26,12 @@
* @namespace platform/features/layout * @namespace platform/features/layout
*/ */
define( define(
['./LayoutDrag'], [
function (LayoutDrag) { './LayoutDrag'
],
function (
LayoutDrag
) {
var DEFAULT_DIMENSIONS = [12, 8], var DEFAULT_DIMENSIONS = [12, 8],
DEFAULT_GRID_SIZE = [32, 32], DEFAULT_GRID_SIZE = [32, 32],
@ -124,6 +128,10 @@ define(
self.select(null, self.droppedIdToSelectAfterRefresh); self.select(null, self.droppedIdToSelectAfterRefresh);
delete self.droppedIdToSelectAfterRefresh; delete self.droppedIdToSelectAfterRefresh;
} }
if (composition.indexOf(self.selectedId) === -1) {
self.clearSelection();
}
} }
}); });
} }

11
platform/features/layout/test/LayoutControllerSpec.js
View File

@ -424,6 +424,17 @@ define(
expect(selectedObj.showFrame).toEqual(jasmine.any(Function)); expect(selectedObj.showFrame).toEqual(jasmine.any(Function));
}); });
it("deselects the object that is no longer in the composition", function () {
mockScope.$watchCollection.mostRecentCall.args[1]();
var childObj = mockCompositionObjects[0];
controller.select(mockEvent, childObj.getId());
var composition = ["b", "c"];
mockScope.$watchCollection.mostRecentCall.args[1](composition);
expect(controller.selected(childObj)).toBe(false);
});
}); });
} }
); );