Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

6 files changed, 113 insertions, 0 deletions

diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
new file mode 100644
index 00000000..39da73f3
--- /dev/null
+++ b/node_modules/components-data/feed-reader.json
@@ -0,0 +1,25 @@
+{
+    "component": "feedreader",
+
+    "module": "montage/ui/feed-reader/feed-reader.reel",
+
+    "name": "FeedReader",
+
+    "properties": [
+        {
+            "name": "feedURL",
+            "type": "string",
+            "default": null
+        },
+        {
+            "name": "feedDisplayMode",
+            "type": "select",
+            "default": "timer",
+            "possibleValues": ["animation", "timer"]
+        }
+    ],
+    "defaultStyles":  {
+        "width":"380px",
+        "height":"120px"
+    }
+}
\ No newline at end of file
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
new file mode 100644
index 00000000..655d222d
--- /dev/null
+++ b/node_modules/components-data/map.json
@@ -0,0 +1,28 @@
+{
+    "component": "map",
+
+    "module": "montage/ui/map.reel",
+
+    "name": "Map",
+
+    "properties": [
+        {
+            "name": "category",
+            "type": "select",
+            "default": "restaurant",
+            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+        },
+        {
+            "name": "center",
+            "type": "string",
+            "default": ""
+        }
+
+    ],
+
+    "defaultStyles":  {
+        "width": "280px",
+        "height": "280px"
+    }
+
+}
\ No newline at end of file
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
new file mode 100644
index 00000000..2eb601c7
--- /dev/null
+++ b/node_modules/components-data/picasa-carousel.json
@@ -0,0 +1,20 @@
+{
+    "component": "picasa-carousel",
+
+    "module": "montage/ui/picasa-carousel.reel",
+
+    "name": "PicasaCarousel",
+
+    "properties": [
+        {
+            "name": "queryParameter",
+            "type": "string",
+            "default": ""
+        }
+    ],
+    "defaultStyles":  {
+        "width":"800px",
+        "height":"160px",
+        "border": "1px"
+    }
+}
\ No newline at end of file
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json
new file mode 100644
index 00000000..94c570d9
--- /dev/null
+++ b/node_modules/components-data/searchfield.json
@@ -0,0 +1,20 @@
+{
+    "component": "searchfield",
+
+    "module": "montage/ui/textfield.reel",
+
+    "name": "Textfield",
+
+    "properties": [
+        {
+            "name": "valueBinding",
+            "type": "string",
+            "default": null
+        },
+        {
+            "name": "value",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json
index 7164b8b3..39c65eab 100644
--- a/node_modules/components-data/textfield.json
+++ b/node_modules/components-data/textfield.json
@@ -7,6 +7,10 @@
 
     "properties": [
         {
+            "name": "valueBinding",
+            "type": "string",
+            "default": null
+        },{
             "name": "accept",
             "type": "string",
             "default": null
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
new file mode 100644
index 00000000..c909fd1b
--- /dev/null
+++ b/node_modules/components-data/youtube-channel.json
@@ -0,0 +1,16 @@
+{
+    "component": "youtube-channel",
+
+    "module": "montage/ui/youtube-channel.reel",
+
+    "name": "YoutubeChannel",
+
+    "properties": [
+        {
+            "name": "channel",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file