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

[Edit] SaveAs now calls finish()

Browse Source
This commit is contained in:
Alex M
2016-09-13 21:24:20 +03:00
parent 3dee082141
commit 79b16ddda6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/commonUI/edit/src/actions/SaveAsAction.js
View File

@ -166,11 +166,16 @@ define([
.then(resolveWith(object)); .then(resolveWith(object));
} }
function commitEditingAfterClone(clonedObject) { function saveAfterClone(clonedObject) {
return domainObject.getCapability("editor").save() return domainObject.getCapability("editor").save()
.then(resolveWith(clonedObject)); .then(resolveWith(clonedObject));
} }
function finishEditing(clonedObject) {
return domainObject.getCapability("editor").finish()
.then(resolveWith(clonedObject));
}
function onFailure() { function onFailure() {
hideBlockingDialog(); hideBlockingDialog();
return false; return false;
@ -182,7 +187,8 @@ define([
.then(getParent) .then(getParent)
.then(cloneIntoParent) .then(cloneIntoParent)
.then(undirtyOriginals) .then(undirtyOriginals)
.then(commitEditingAfterClone) .then(saveAfterClone)
.then(finishEditing)
.then(hideBlockingDialog) .then(hideBlockingDialog)
.catch(onFailure); .catch(onFailure);
}; };

3
platform/commonUI/edit/test/actions/SaveAsActionSpec.js
View File

@ -78,9 +78,8 @@ define(
mockEditorCapability = jasmine.createSpyObj( mockEditorCapability = jasmine.createSpyObj(
"editor", "editor",
["save", "cancel", "isEditContextRoot"] ["save", "isEditContextRoot"]
); );
mockEditorCapability.cancel.andReturn(mockPromise(undefined));
mockEditorCapability.save.andReturn(mockPromise(true)); mockEditorCapability.save.andReturn(mockPromise(true));
mockEditorCapability.isEditContextRoot.andReturn(true); mockEditorCapability.isEditContextRoot.andReturn(true);
capabilities.editor = mockEditorCapability; capabilities.editor = mockEditorCapability;