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

[Inspector] Location does not include self

Browse Source 
Changed the object inspector's location getting
to not include the object itself in the
location, just its ancestors. #73.
This commit is contained in:
slhale 2015-08-25 13:06:15 -07:00
parent 5080b5296e
commit c3e5fbf713
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/commonUI/general/src/controllers/ObjectInspectorController.js
View File

@ -46,13 +46,18 @@ define(
currentParent, currentParent,
parents = []; parents = [];
while (currentObj && currentObj.getModel().type !== 'root' && currentObj.hasCapability('context')) { currentParent = currentObj &&
currentObj.hasCapability('context') &&
currentObj.getCapability('context').getParent();
while (currentParent && currentParent.getModel().type !== 'root' &&
currentParent.hasCapability('context')) {
// Record this object // Record this object
parents.unshift(currentObj); parents.unshift(currentParent);
// Get the next one up the tree // Get the next one up the tree
currentParent = currentObj.getCapability('context').getParent();
currentObj = currentParent; currentObj = currentParent;
currentParent = currentObj.getCapability('context').getParent();
} }
$scope.contextutalParents = parents; $scope.contextutalParents = parents;
@ -66,7 +71,7 @@ define(
// If this the the initial call of this recursive function // If this the the initial call of this recursive function
if (!current) { if (!current) {
current = $scope.ngModel.selectedObject; current = $scope.ngModel.selectedObject;
$scope.primaryParents = [current]; $scope.primaryParents = [];
} }
location = current.getModel().location; location = current.getModel().location;