Merge branch 'open-master' into open962

Merge in latest from open-master into topic branch for WTD-962
2015-04-10 17:30:03 -07:00
parent 952f380c33 79f6e8c082
commit f6df73c11b
24 changed files with 738 additions and 55 deletions
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -45,7 +45,7 @@
            },
            {
                "key": "properties",
-                "category": "contextual",
+                "category": ["contextual", "view-control"],
                "implementation": "actions/PropertiesAction.js",
                "glyph": "p",
                "name": "Edit Properties...",
@@ -79,6 +79,16 @@
                "depends": [ "$location" ]
            }
        ],
+        "policies": [
+            {
+                "category": "action",
+                "implementation": "policies/EditActionPolicy.js"
+            },
+            {
+                "category": "view",
+                "implementation": "policies/EditableViewPolicy.js"
+            }
+        ],
        "templates": [
            {
                "key": "edit-library",