Merged from Master

2016-01-14 17:23:53 -08:00
parent 3e7eb11d84 88f8925d17
commit 032b2542f0
84 changed files with 605 additions and 3970 deletions
--- a/platform/features/pages/bundle.json
+++ b/platform/features/pages/bundle.json
@@ -1,38 +0,0 @@
-{
-    "extensions": {
-        "types": [
-            {
-                "key": "example.page",
-                "name": "Web Page",
-                "glyph": "\u00EA",
-                "description": "A component to display a web page or image with a valid URL. Can be added to a Display Layout.",
-                "features": [ "creation" ],
-                "properties": [
-                    {
-                        "key": "url",
-                        "name": "URL",
-                        "control": "textfield",
-                        "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
-                        "required": true
-                    }
-                ]
-            }
-        ],
-        "views": [
-            {
-                "templateUrl": "iframe.html",
-                "name": "Page",
-                "type": "example.page",
-                "key": "example.page",
-                "editable": false
-            }
-        ],
-        "controllers": [
-            {
-                "key": "EmbeddedPageController",
-                "implementation": "EmbeddedPageController.js",
-                "depends": ["$sce"]
-            }
-        ]
-    }
-}