ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 22:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Edit] Cancel action depends on promise resolution

Browse Source 
Cancel action no longer cares about return value, simply
will not execute if navigtion promise does not resolve.

https://github.com/nasa/openmct/issues/1360
This commit is contained in:
Pete Richards 2016-12-20 15:28:15 -08:00
parent fcda211800
commit 6328bd9354
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/edit/src/actions/CancelAction.js
View File

@ -56,13 +56,13 @@ define(
//navigate back to parent because nothing to show. //navigate back to parent because nothing to show.
return domainObject.getCapability("location").getOriginal().then(function (original) { return domainObject.getCapability("location").getOriginal().then(function (original) {
parent = original.getCapability("context").getParent(); parent = original.getCapability("context").getParent();
parent.getCapability("action").perform("navigate"); return parent.getCapability("action").perform("navigate");
}); });
} }
} }
function cancel(allowed) { function cancel() {
return allowed && domainObject.getCapability("editor").finish(); return domainObject.getCapability("editor").finish();
} }
//Do navigation first in order to trigger unsaved changes dialog //Do navigation first in order to trigger unsaved changes dialog