From 1753a5473cf8508eca8c695a53dbdc2f55748f03 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Thu, 12 May 2016 16:11:52 -0700
Subject: [PATCH] Resolved merge conflicts

---
 .../src/policies/EditContextualActionPolicy.js  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js b/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
index 32a24050e0..b5853bd89c 100644
--- a/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
@@ -34,6 +34,7 @@ define(
          * from context menu of non-editable objects, when navigated object
          * is being edited
          * @constructor
+         * @implements {Policy.<Action, ActionContext>}
          */
         function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) {
             this.navigationService = navigationService;
@@ -45,22 +46,18 @@ define(
             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) {
             var selectedObject = context.domainObject,
                 navigatedObject = this.navigationService.getNavigation(),
                 actionMetadata = action.getMetadata ? action.getMetadata() : {};
 
-            if (navigatedObject.hasCapability('editor')) {
-                if (selectedObject.hasCapability('editor') || isParentEditable(selectedObject)){
-                    return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
+            if (navigatedObject.getCapability("status").get("editing")) {
+                if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()){
+                    //Target is within the editing context
+                    return this.editBlacklist.indexOf(actionMetadata.key) === -1;
                 } else {
-                    //Target is in the context menu
-                    return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
+                    //Target is not within the editing context
+                    return this.nonEditBlacklist.indexOf(actionMetadata.key) === -1;
                 }
             } else {
                 return true;