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

[Edit Mode] Fixed spelling mistake, moved variable declaration

Browse Source
This commit is contained in:
Henry
2016-09-22 11:04:04 -07:00
parent 3548cde9c4
commit 7a94efccbf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/browse/src/navigation/NavigateAction.js
View File

@ -49,9 +49,7 @@ define(
NavigateAction.prototype.perform = function () { NavigateAction.prototype.perform = function () {
var self = this, var self = this,
navigateTo = this.domainObject, navigateTo = this.domainObject,
currentObject = self.navigationService.getNavigation(), currentObject = self.navigationService.getNavigation();
editing = currentObject.hasCapability('editor') &&
currentObject.getCapability('editor').isEditContextRoot();
function allow() { function allow() {
var navigationAllowed = true; var navigationAllowed = true;
@ -63,6 +61,9 @@ define(
} }
function cancelIfEditing() { function cancelIfEditing() {
var editing = currentObject.hasCapability('editor') &&
currentObject.getCapability('editor').isEditContextRoot();
return self.$q.when(editing && currentObject.getCapability("editor").cancel()); return self.$q.when(editing && currentObject.getCapability("editor").cancel());
} }

2
platform/commonUI/browse/test/navigation/NavigateActionSpec.js
View File

@ -140,7 +140,7 @@ define(
}); });
}); });
describe("in edit more", function () { describe("in edit mode", function () {
beforeEach(function () { beforeEach(function () {
mockNavigatedObject.hasCapability.andCallFake(function (capability) { mockNavigatedObject.hasCapability.andCallFake(function (capability) {
return capability === "editor"; return capability === "editor";

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

@ -76,7 +76,6 @@ define(
this.navigationService.setNavigation(this.domainObject); this.navigationService.setNavigation(this.domainObject);
} }
//this.navigationService.addListener(cancelEditing);
this.domainObject.useCapability("editor"); this.domainObject.useCapability("editor");
}; };