Merge branch 'open1062' into open-master

Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
parent 9d3c22655d 9be40d6d2a
commit 79f6e8c082
13 changed files with 389 additions and 8 deletions
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -41,7 +41,7 @@
            },
            {
                "key": "properties",
-                "category": "contextual",
+                "category": ["contextual", "view-control"],
                "implementation": "actions/PropertiesAction.js",
                "glyph": "p",
                "name": "Edit Properties...",
@@ -75,6 +75,16 @@
                "depends": [ "$location" ]
            }
        ],
+        "policies": [
+            {
+                "category": "action",
+                "implementation": "policies/EditActionPolicy.js"
+            },
+            {
+                "category": "view",
+                "implementation": "policies/EditableViewPolicy.js"
+            }
+        ],
        "templates": [
            {
                "key": "edit-library",