Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components

4 files changed, 26 insertions, 6 deletions

diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 6caf768d..1e055eef 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -10,6 +10,15 @@
             "name": "feedURL",
             "type": "string",
             "default": null
+        },
+        {
+            "name": "feedDisplayMode",
+            "type": "string",
+            "default": "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
index 796b2fad..655d222d 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -8,8 +8,8 @@
     "properties": [
         {
             "name": "category",
-            "type": "string",
-            "default": "",
+            "type": "select",
+            "default": "restaurant",
             "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
         },
         {
@@ -18,5 +18,11 @@
             "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
index 34fe0e8f..2eb601c7 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -11,5 +11,10 @@
             "type": "string",
             "default": ""
         }
-    ]
+    ],
+    "defaultStyles":  {
+        "width":"800px",
+        "height":"160px",
+        "border": "1px"
+    }
 }
\ No newline at end of file
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
index 8affffba..c909fd1b 100644
--- a/node_modules/components-data/youtube-channel.json
+++ b/node_modules/components-data/youtube-channel.json
@@ -7,7 +7,7 @@
 
     "properties": [
         {
-            "name": "channelUrl",
+            "name": "channel",
             "type": "string",
             "default": ""
         }