diff options
| author | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
| commit | beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7 (patch) | |
| tree | 71ee74df0c3a56b680e4aa80f23905fcb1cc84f1 /node_modules/components-data/feed-reader.json | |
| parent | 37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8 (diff) | |
| parent | 31eee2972667d7553974f0857fdc458954219203 (diff) | |
| download | ninja-beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7.tar.gz | |
Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components
Diffstat (limited to 'node_modules/components-data/feed-reader.json')
| -rw-r--r-- | node_modules/components-data/feed-reader.json | 11 |
1 files changed, 10 insertions, 1 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 |