alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fixed Position] Modify fixed position to use the Selection API

Browse Source 
Change method name to shouldSelect() as requested by the reviewer.

Fix tests.

Fixes #1848
This commit is contained in:
Pegah Sarram
2017-12-07 14:59:12 -08:00
committed by Victor Woeltjen
parent 0c6786198a
commit 14894cf197
10 changed files with 248 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,8 @@ define(
return;
}
var selectedObjectComposition = selection[0].context.oldItem.useCapability('composition');
var selected = selection[0].context.oldItem;
var selectedObjectComposition = selected && selected.useCapability('composition');
if (selectedObjectComposition) {
selectedObjectComposition.then(function (composition) {

10
platform/commonUI/edit/src/representers/EditToolbarSelection.js
View File

@@ -44,11 +44,17 @@ define(
this.selectedObj = undefined;
openmct.selection.on('change', function (selection) {
if (selection[0] && selection[0].context.toolbar) {
this.select(selection[0].context.toolbar);
var selected = selection[0];
if (selected && selected.context.toolbar) {
this.select(selected.context.toolbar);
} else {
this.deselect();
}
if (selected && selected.context.viewProxy) {
this.proxy(selected.context.viewProxy);
}
}.bind(this));
}