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

Resolved merge conflicts

Browse Source
This commit is contained in:
Henry
2016-05-12 16:11:52 -07:00
parent d00e13e4ee
commit 1753a5473c
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ 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
* @implements {Policy.<Action, ActionContext>}
*/ */
function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) { function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) {
this.navigationService = navigationService; this.navigationService = navigationService;
@@ -45,22 +46,18 @@ define(
this.nonEditContextBlacklist = nonEditContextBlacklist; this.nonEditContextBlacklist = nonEditContextBlacklist;
} }
function isParentEditable(object) {
var parent = object.hasCapability("context") && object.getCapability("context").getParent();
return !!parent && parent.hasCapability("editor");
}
EditContextualActionPolicy.prototype.allow = function (action, context) { EditContextualActionPolicy.prototype.allow = function (action, context) {
var selectedObject = context.domainObject, var selectedObject = context.domainObject,
navigatedObject = this.navigationService.getNavigation(), navigatedObject = this.navigationService.getNavigation(),
actionMetadata = action.getMetadata ? action.getMetadata() : {}; actionMetadata = action.getMetadata ? action.getMetadata() : {};
if (navigatedObject.hasCapability('editor')) { if (navigatedObject.getCapability("status").get("editing")) {
if (selectedObject.hasCapability('editor') || isParentEditable(selectedObject)){ if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()){
return this.editModeBlacklist.indexOf(actionMetadata.key) === -1; //Target is within the editing context
return this.editBlacklist.indexOf(actionMetadata.key) === -1;
} else { } else {
//Target is in the context menu //Target is not within the editing context
return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1; return this.nonEditBlacklist.indexOf(actionMetadata.key) === -1;
} }
} else { } else {
return true; return true;