Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components

55 files changed, 2639 insertions, 3 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..6caf768d
--- /dev/null
+++ b/node_modules/components-data/feed-reader.json
@@ -0,0 +1,15 @@
+{
+    "component": "feedreader",
+
+    "module": "montage/ui/feed-reader/feed-reader.reel",
+
+    "name": "FeedReader",
+
+    "properties": [
+        {
+            "name": "feedURL",
+            "type": "string",
+            "default": null
+        }
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
new file mode 100644
index 00000000..796b2fad
--- /dev/null
+++ b/node_modules/components-data/map.json
@@ -0,0 +1,22 @@
+{
+    "component": "map",
+
+    "module": "montage/ui/map.reel",
+
+    "name": "Map",
+
+    "properties": [
+        {
+            "name": "category",
+            "type": "string",
+            "default": "",
+            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+        },
+        {
+            "name": "center",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
new file mode 100644
index 00000000..34fe0e8f
--- /dev/null
+++ b/node_modules/components-data/picasa-carousel.json
@@ -0,0 +1,15 @@
+{
+    "component": "picasa-carousel",
+
+    "module": "montage/ui/picasa-carousel.reel",
+
+    "name": "PicasaCarousel",
+
+    "properties": [
+        {
+            "name": "queryParameter",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json
new file mode 100644
index 00000000..94c570d9
--- /dev/null
+++ b/node_modules/components-data/searchfield.json
@@ -0,0 +1,20 @@
+{
+    "component": "searchfield",
+
+    "module": "montage/ui/textfield.reel",
+
+    "name": "Textfield",
+
+    "properties": [
+        {
+            "name": "valueBinding",
+            "type": "string",
+            "default": null
+        },
+        {
+            "name": "value",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json
index 7164b8b3..39c65eab 100644
--- a/node_modules/components-data/textfield.json
+++ b/node_modules/components-data/textfield.json
@@ -7,6 +7,10 @@
 
     "properties": [
         {
+            "name": "valueBinding",
+            "type": "string",
+            "default": null
+        },{
             "name": "accept",
             "type": "string",
             "default": null
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
new file mode 100644
index 00000000..8affffba
--- /dev/null
+++ b/node_modules/components-data/youtube-channel.json
@@ -0,0 +1,16 @@
+{
+    "component": "youtube-channel",
+
+    "module": "montage/ui/youtube-channel.reel",
+
+    "name": "YoutubeChannel",
+
+    "properties": [
+        {
+            "name": "channelUrl",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/montage/examples/feed-reader/images/07-map-marker.png b/node_modules/montage/examples/feed-reader/images/07-map-marker.png
new file mode 100644
index 00000000..a5d99d69
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/07-map-marker.png
diff --git a/node_modules/montage/examples/feed-reader/images/10-medical.png b/node_modules/montage/examples/feed-reader/images/10-medical.png
new file mode 100644
index 00000000..ab78c783
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/10-medical.png
diff --git a/node_modules/montage/examples/feed-reader/images/100-coffee.png b/node_modules/montage/examples/feed-reader/images/100-coffee.png
new file mode 100644
index 00000000..4e9c517a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/100-coffee.png
diff --git a/node_modules/montage/examples/feed-reader/images/107-widescreen.png b/node_modules/montage/examples/feed-reader/images/107-widescreen.png
new file mode 100644
index 00000000..2e5f1ba7
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/107-widescreen.png
diff --git a/node_modules/montage/examples/feed-reader/images/125-food.png b/node_modules/montage/examples/feed-reader/images/125-food.png
new file mode 100644
index 00000000..81afd74a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/125-food.png
diff --git a/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png
new file mode 100644
index 00000000..a7df9e97
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png
diff --git a/node_modules/montage/examples/feed-reader/images/34-coffee.png b/node_modules/montage/examples/feed-reader/images/34-coffee.png
new file mode 100644
index 00000000..4c4bedad
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/34-coffee.png
diff --git a/node_modules/montage/examples/feed-reader/images/35-shopping.png b/node_modules/montage/examples/feed-reader/images/35-shopping.png
new file mode 100644
index 00000000..03689f99
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/35-shopping.png
diff --git a/node_modules/montage/examples/feed-reader/images/38-airplane.png b/node_modules/montage/examples/feed-reader/images/38-airplane.png
new file mode 100644
index 00000000..dfcbbc78
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/38-airplane.png
diff --git a/node_modules/montage/examples/feed-reader/images/41-picture-frame.png b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png
new file mode 100644
index 00000000..6deee997
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png
diff --git a/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png b/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png
new file mode