Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

1 files changed, 25 insertions, 0 deletions

diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
new file mode 100644
index 00000000..39da73f3
--- /dev/null
+++ b/node_modules/components-data/feed-reader.json
@@ -0,0 +1,25 @@
+{
+    "component": "feedreader",
+
+    "module": "montage/ui/feed-reader/feed-reader.reel",
+
+    "name": "FeedReader",
+
+    "properties": [
+        {
+            "name": "feedURL",
+            "type": "string",
+            "default": null
+        },
+        {
+            "name": "feedDisplayMode",
+            "type": "select",
+            "default": "timer",
+            "possibleValues": ["animation", "timer"]
+        }
+    ],
+    "defaultStyles":  {
+        "width":"380px",
+        "height":"120px"
+    }
+}
\ No newline at end of file