diff options
| author | Jose Antonio Marquez | 2012-03-22 16:26:02 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-22 16:26:02 -0700 |
| commit | 748a5c55e15809add748a15a87cd730e3fcee4bf (patch) | |
| tree | 688f3ee299b2985fa5617426a5789d86f518b877 /node_modules | |
| parent | 7fbda862c62f37d4c67e4d5a619b7e3cffc309ff (diff) | |
| parent | b25195d010417417bb5b2e5362385078d68d9a84 (diff) | |
| download | ninja-748a5c55e15809add748a15a87cd730e3fcee4bf.tar.gz | |
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
Diffstat (limited to 'node_modules')
| -rw-r--r-- | node_modules/components-data/feed-reader.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 1e055eef..7a5bd276 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
| @@ -13,8 +13,9 @@ | |||
| 13 | }, | 13 | }, |
| 14 | { | 14 | { |
| 15 | "name": "feedDisplayMode", | 15 | "name": "feedDisplayMode", |
| 16 | "type": "string", | 16 | "type": "select", |
| 17 | "default": "timer" | 17 | "default": "animation", |
| 18 | "possibleValues": ["animation", "timer"] | ||
| 18 | } | 19 | } |
| 19 | ], | 20 | ], |
| 20 | "defaultStyles": { | 21 | "defaultStyles": { |