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

Resolved residual merge issue

Browse Source
This commit is contained in:
Henry 2016-05-12 16:18:48 -07:00
parent 69c4c3a2c8
commit ffacf6e1ae
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
View File

@ -34,7 +34,6 @@ define(
* from context menu of non-editable objects, when navigated object * from context menu of non-editable objects, when navigated object
* is being edited * is being edited
* @constructor * @constructor
* @param navigationService
* @param editModeBlacklist A blacklist of actions disallowed from * @param editModeBlacklist A blacklist of actions disallowed from
* context menu when navigated object is being edited * context menu when navigated object is being edited
* @param nonEditContextBlacklist A blacklist of actions disallowed * @param nonEditContextBlacklist A blacklist of actions disallowed
@ -58,11 +57,10 @@ define(
if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) { if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()){ if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()){
//Target is within the editing context return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
return this.editBlacklist.indexOf(actionMetadata.key) === -1;
} else { } else {
//Target is not within the editing context //Target is in the context menu
return this.nonEditBlacklist.indexOf(actionMetadata.key) === -1; return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
} }
} else { } else {
return true; return true;