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

[Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation. Fixes 1080

Browse Source
This commit is contained in:
Henry
2016-09-21 16:12:09 -07:00
parent e0b6986851
commit 3548cde9c4
5 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/edit/src/actions/EditAction.js
View File

@@ -69,18 +69,14 @@ define(
* Enter edit mode.
*/
EditAction.prototype.perform = function () {
var self = this;
function cancelEditing() {
self.domainObject.getCapability('editor').cancel();
self.navigationService.removeListener(cancelEditing);
}
//If this is not the currently navigated object, then navigate
// to it.
if (this.navigationService.getNavigation() !== this.domainObject) {
this.navigationService.setNavigation(this.domainObject);
}
this.navigationService.addListener(cancelEditing);
//this.navigationService.addListener(cancelEditing);
this.domainObject.useCapability("editor");
};

2
platform/commonUI/edit/src/services/TransactionService.js
View File

@@ -138,7 +138,7 @@ define(
try {
results.push(onCancel());
} catch (error) {
this.$log.error("Error committing transaction.");
this.$log.error("Error cancelling transaction.");
}
}
return this.$q.all(results).then(function () {

7
platform/commonUI/edit/test/actions/EditActionSpec.js
View File

@@ -98,13 +98,6 @@ define(
expect(EditAction.appliesTo(actionContext)).toBe(false);
});
it ("cancels editing when user navigates away", function () {
action.perform();
expect(mockNavigationService.addListener).toHaveBeenCalled();
mockNavigationService.addListener.mostRecentCall.args[0]();
expect(mockEditor.cancel).toHaveBeenCalled();
});
it ("invokes the Edit capability on the object", function () {
action.perform();
expect(mockDomainObject.useCapability).toHaveBeenCalledWith("editor");