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

[Angular] Check for context capability

Browse Source 
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
This commit is contained in:
Victor Woeltjen
2015-09-09 17:25:02 -07:00
parent 52df7fe1e2
commit c6df7cebe5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/commonUI/edit/src/actions/RemoveAction.js
View File

@ -81,7 +81,7 @@ define(
var persistence = domainObject.getCapability('persistence'); var persistence = domainObject.getCapability('persistence');
return persistence && persistence.persist(); return persistence && persistence.persist();
} }
/* /*
* Checks current object and ascendants of current * Checks current object and ascendants of current
* object with object being removed, if the current * object with object being removed, if the current
@ -90,11 +90,12 @@ define(
*/ */
function checkObjectNavigation(object, parentObject) { function checkObjectNavigation(object, parentObject) {
// Traverse object starts at current location // Traverse object starts at current location
var traverseObject = (navigationService).getNavigation(); var traverseObject = (navigationService).getNavigation(),
context;
// Stop when object is not defined (above ROOT) // Stop when object is not defined (above ROOT)
while (traverseObject) { while (traverseObject) {
// If object currently traversed to is object being removed // If object currently traversed to is object being removed
// navigate to parent of current object and then exit loop // navigate to parent of current object and then exit loop
if (traverseObject.getId() === object.getId()) { if (traverseObject.getId() === object.getId()) {
@ -103,7 +104,8 @@ define(
} }
// Traverses to parent of current object, moving // Traverses to parent of current object, moving
// up the ascendant path // up the ascendant path
traverseObject = traverseObject.getCapability('context').getParent(); context = traverseObject.getCapability('context');
traverseObject = context && context.getParent();
} }
} }
@ -115,11 +117,11 @@ define(
function removeFromContext(object) { function removeFromContext(object) {
var contextCapability = object.getCapability('context'), var contextCapability = object.getCapability('context'),
parent = contextCapability.getParent(); parent = contextCapability.getParent();
// If currently within path of removed object(s), // If currently within path of removed object(s),
// navigates to existing object up tree // navigates to existing object up tree
checkObjectNavigation(object, parent); checkObjectNavigation(object, parent);
return $q.when( return $q.when(
parent.useCapability('mutation', doMutate) parent.useCapability('mutation', doMutate)
).then(function () { ).then(function () {