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

[Layout] Select the fixed position view only if the parent is not selected.

Browse Source 
Also, add mutation listener if domain object is defined to fix the TypeError.

Fixes # 1909 and #1912
This commit is contained in:
Pegah Sarram
2018-02-13 13:23:49 -08:00
parent d4e3e6689c
commit e5d869f01e
3 changed files with 16 additions and 4 deletions
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;
self.refreshComposition(domainObject);
self.mutationListener = domainObject.getCapability('mutation')
.listen(self.refreshComposition.bind(self, domainObject));
if (domainObject) {
self.mutationListener = domainObject.getCapability('mutation')
.listen(self.refreshComposition.bind(self, domainObject));
}
}
$scope.filterBy = filterBy;
@@ -86,7 +88,7 @@ define(
* @private
*/
ElementsController.prototype.refreshComposition = function (domainObject) {
var selectedObjectComposition = domainObject.useCapability('composition');
var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
if (selectedObjectComposition) {
selectedObjectComposition.then(function (composition) {