aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-21 09:53:08 -0700
committerJose Antonio Marquez2012-03-21 09:53:08 -0700
commitbeb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7 (patch)
tree71ee74df0c3a56b680e4aa80f23905fcb1cc84f1 /node_modules/components-data
parent37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8 (diff)
parent31eee2972667d7553974f0857fdc458954219203 (diff)
downloadninja-beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7.tar.gz
Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/feed-reader.json11
-rw-r--r--node_modules/components-data/map.json12
-rw-r--r--node_modules/components-data/picasa-carousel.json7
-rw-r--r--node_modules/components-data/youtube-channel.json2
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 @@
10 "name": "feedURL", 10 "name": "feedURL",
11 "type": "string", 11 "type": "string",
12 "default": null 12 "default": null
13 },
14 {
15 "name": "feedDisplayMode",
16 "type": "string",
17 "default": "timer"
13 } 18 }
14 ] 19 ],
20 "defaultStyles": {
21 "width":"380px",
22 "height":"120px"
23 }
15} \ No newline at end of file 24} \ 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 @@
8 "properties": [ 8 "properties": [
9 { 9 {
10 "name": "category", 10 "name": "category",
11 "type": "string", 11 "type": "select",
12 "default": "", 12 "default": "restaurant",
13 "possibleValues": ["restaurant", "hospital", "cafe", "museum"] 13 "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
14 }, 14 },
15 { 15 {
@@ -18,5 +18,11 @@
18 "default": "" 18 "default": ""
19 } 19 }
20 20
21 ] 21 ],
22
23 "defaultStyles": {
24 "width": "280px",
25 "height": "280px"
26 }
27
22} \ No newline at end of file 28} \ 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 @@
11 "type": "string", 11 "type": "string",
12 "default": "" 12 "default": ""
13 } 13 }
14 ] 14 ],
15 "defaultStyles": {
16 "width":"800px",
17 "height":"160px",
18 "border": "1px"
19 }
15} \ No newline at end of file 20} \ 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 @@
7 7
8 "properties": [ 8 "properties": [
9 { 9 {
10 "name": "channelUrl", 10 "name": "channel",
11 "type": "string", 11 "type": "string",
12 "default": "" 12 "default": ""
13 } 13 }