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

Merge pull request #1913 from nasa/layout-issue-1909

Browse Source 
[Layout] Select fixed position view only if the parent is not selected
This commit is contained in:
Deep Tailor 2018-02-15 15:20:03 -08:00 committed by GitHub
commit dc91a94f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/edit/src/controllers/ElementsController.js
View File

@ -64,8 +64,10 @@ define(
var domainObject = selection[0].context.oldItem; var domainObject = selection[0].context.oldItem;
self.refreshComposition(domainObject); self.refreshComposition(domainObject);
self.mutationListener = domainObject.getCapability('mutation') if (domainObject) {
.listen(self.refreshComposition.bind(self, domainObject)); self.mutationListener = domainObject.getCapability('mutation')
.listen(self.refreshComposition.bind(self, domainObject));
}
} }
$scope.filterBy = filterBy; $scope.filterBy = filterBy;
@ -86,7 +88,7 @@ define(
* @private * @private
*/ */
ElementsController.prototype.refreshComposition = function (domainObject) { ElementsController.prototype.refreshComposition = function (domainObject) {
var selectedObjectComposition = domainObject.useCapability('composition'); var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
if (selectedObjectComposition) { if (selectedObjectComposition) {
selectedObjectComposition.then(function (composition) { selectedObjectComposition.then(function (composition) {

10
platform/commonUI/edit/test/controllers/ElementsControllerSpec.js
View File

@ -127,6 +127,16 @@ define(
expect(mockUnlisten).toHaveBeenCalled(); expect(mockUnlisten).toHaveBeenCalled();
}); });
it("does not listen on mutation for element proxy selectable", function () {
selectable[0] = {
context: {
elementProxy: {}
}
};
mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
expect(mockDomainObject.getCapability).not.toHaveBeenCalledWith('mutation');
});
}); });
} }
); );

2
platform/features/layout/src/FixedController.js
View File

@ -272,7 +272,7 @@ define(
self.resizeHandles = self.generateDragHandles(self.selectedElementProxy); self.resizeHandles = self.generateDragHandles(self.selectedElementProxy);
} else { } else {
// Make fixed view selectable if it's not already. // Make fixed view selectable if it's not already.
if (!self.fixedViewSelectable) { if (!self.fixedViewSelectable && selectable.length === 1) {
self.fixedViewSelectable = true; self.fixedViewSelectable = true;
selection.context.viewProxy = new FixedProxy(addElement, $q, dialogService); selection.context.viewProxy = new FixedProxy(addElement, $q, dialogService);
self.openmct.selection.select(selection); self.openmct.selection.select(selection);