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

26 files changed, 594 insertions, 199 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 @@
             "name": "feedURL",
             "type": "string",
             "default": null
+        },
+        {
+            "name": "feedDisplayMode",
+            "type": "string",
+            "default": "timer"
         }
-    ]
+    ],
+    "defaultStyles":  {
+        "width":"380px",
+        "height":"120px"
+    }
 }
\ No newline at end of file
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 @@
     "properties": [
         {
             "name": "category",
-            "type": "string",
-            "default": "",
+            "type": "select",
+            "default": "restaurant",
             "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
         },
         {
@@ -18,5 +18,11 @@
             "default": ""
         }
 
-    ]
+    ],
+
+    "defaultStyles":  {
+        "width": "280px",
+        "height": "280px"
+    }
+
 }
\ No newline at end of file
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index 34fe0e8f..2eb601c7 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -11,5 +11,10 @@
             "type": "string",
             "default": ""
         }
-    ]
+    ],
+    "defaultStyles":  {
+        "width":"800px",
+        "height":"160px",
+        "border": "1px"
+    }
 }
\ 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 @@
 
     "properties": [
         {
-            "name": "channelUrl",
+            "name": "channel",
             "type": "string",
             "default": ""
         }
diff --git a/node_modules/montage/examples/feed-reader/images/47-fuel.png b/node_modules/montage/examples/feed-reader/images/47-fuel.png
new file mode 100644
index 00000000..617d7640
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/47-fuel.png
diff --git a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
new file mode 100644
index 00000000..51a5f86f
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
diff --git a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
new file mode 100644
index 00000000..b0fdd99a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
index 8ea9a79b..1313219f 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -44,7 +44,9 @@
         "module": "montage/ui/feed-reader/feed-reader.reel",
         "name": "FeedReader",
         "properties": {
-            "element": {"#": "feed-reader"}
+            "element": {"#": "feed-reader"},
+            "feedDisplayMode": "animation",
+            "interval": "3"
         }
     },
     
@@ -76,9 +78,29 @@
     "map": {
         "prototype": "montage/ui/map.reel",
         "properties": {
-            "element": {"#": "map"}
+            "element": {"#": "map"},
+            "traffic": false
+        },
+        "bindings": {
+            "traffic": {
+                "boundObject": {"@": "traffic"},
+                "boundObjectPropertyPath": "checked"
+            }
+        }
+    },
+    
+    "types": {
+        "prototype": "montage/ui/select-input.reel",
+        "properties": {
+            "element": {"#": "types"}
         }
     },
+    "traffic": {
+        "prototype": "montage/ui/checkbox.reel",
+        "properties": {
+            "element": {"#": "traffic"}
+        }        
+    },
 
     "owner": {
         "module": "main.reel",
@@ -92,6 +114,10 @@
             "mapCenter": {
                 "boundObject": {"@": "mapCenter"},
                 "boundObjectPropertyPath": "value"
+            },
+            "mapCategory": {
+                "boundObject": {"@": "types"},
+                "boundObjectPropertyPath": "value"
             }
         }
     }
@@ -140,7 +166,59 @@
             visibility: hidden;
         }
         
+        #map, #feed-reader {
+            margin-top: 10px;
+        }
+        
+        
+        /*
+        .feed-reader .feed-entry {
+            visibility:hidden;
+            opacity:0;
+            transition:visibility 0s linear 0.5s,opacity 0.5s linear;
+        }
+        .feed-reader .feed-entry .active {
+            visibility:visible;
+            opacity:1;
+            transition-delay:0s;
+        }
+        */
+        
+        @-webkit-keyframes rotateWithAlphaKeyframes {
+            0% {
+                    opacity: 0;
+                    -webkit-transform: perspective(1000) rotateY(95deg);