aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-19 14:46:38 -0700
committerValerio Virgillito2012-03-19 14:46:38 -0700
commite9244d5a0f681ddde5896392c17738add2948687 (patch)
tree06d1d6a65c2e9a05dd6063c1974f2174922c37d3 /node_modules/components-data
parente9c3c7d758fc59ad7b731730dd935170844d9538 (diff)
parentdd382088b4990c4e39f77d793c1a6bd7e3c52aca (diff)
downloadninja-e9244d5a0f681ddde5896392c17738add2948687.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/map.json12
-rw-r--r--node_modules/components-data/youtube-channel.json2
2 files changed, 10 insertions, 4 deletions
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/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 }