Changes to Map and FeedReader

- Added traffic property to Map
- Support for show/hide traffic in the example
- Changed FeedReader to use only one DIV. No longer uses Repetition
- Support multiple modes in the Feed reader - timed/animated

5 files changed, 148 insertions, 88 deletions

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 ef4fc92a..50bac601 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": "timed",
+            "interval": "5"
         }
     },
     
@@ -76,7 +78,14 @@
     "map": {
         "prototype": "montage/ui/map.reel",
         "properties": {
-            "element": {"#": "map"}
+            "element": {"#": "map"},
+            "traffic": false
+        },
+        "bindings": {
+            "traffic": {
+                "boundObject": {"@": "traffic"},
+                "boundObjectPropertyPath": "checked"
+            }
         }
     },
     
@@ -86,6 +95,12 @@
             "element": {"#": "types"}
         }
     },
+    "traffic": {
+        "prototype": "montage/ui/checkbox.reel",
+        "properties": {
+            "element": {"#": "traffic"}
+        }        
+    },
 
     "owner": {
         "module": "main.reel",
@@ -155,6 +170,18 @@
             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;
+        }
+        */
 
     </style>
 
@@ -194,6 +221,7 @@
                                 <option value='gas_station'>Gas Stations</option>
                             </select>
                         </div>
+                        <input type="checkbox" id="traffic">Show Traffic</input>
                     </form>
                 </div>
                 <div id="map">Map</div>
diff --git a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js
index 3d97eec7..72c5023e 100644
--- a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js
+++ b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js
@@ -8,6 +8,14 @@ var Montage = require("montage").Montage,
 
 exports.FeedEntry = Montage.create(Component, {
 
-    entry: {value: null}
+    _entry: {value: null},
+    entry: {
+        get: function() {
+            return this._entry;
+        },
+        set: function(value) {
+            this._entry = value;            
+        }
+    }
     
 });
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
index 646fd01e..e5251e0a 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -23,17 +23,7 @@
             }
         }
     },
-    
-    "repetition": {
-        "module": "montage/ui/repetition.reel",
-        "name": "Repetition",
-        "properties": {
-            "element": {"#": "entries"},
-            "contentController": {"@": "entriesController"},
-            "isSelectionEnabled": true,
-            "orientation": "vertical"
-        }        
-    },    
+        
     "feedEntry": {
         "module": "montage/ui/feed-reader/feed-entry.reel",
         "name": "FeedEntry",
@@ -42,27 +32,19 @@
         },
         "bindings": {
             "entry": {
-                "boundObject": {"@": "repetition"},
-                "boundObjectPropertyPath": "objectAtCurrentIteration",
+                "boundObject": {"@": "owner"},
+                "boundObjectPropertyPath": "activeFeedEntry",
                 "oneway": true
             }
-        }
+        }        
     },
     
     "owner": {
         "module": "montage/ui/feed-reader/feed-reader.reel",
         "name": "FeedReader",
         "properties": {
-            "element": {"#": "feed-reader"},
-            "repetition": {"@": "repetition"}
-        },
-        "bindings": {
-            "items": {
-                "boundObject": {"@": "repetition"},
-                "boundObjectPropertyPath": "objects",
-                "oneway": true
-            }
-        }
+            "element": {"#": "feed-reader"}
+        }        
     }
     
 }
@@ -74,16 +56,8 @@
        }
        
        .feed-entry {
-           display: none;
-       }
-       
-       .montage-hidden {
-           display: none;
        }
        
-       .active {
-           display: block;
-       }
        
     </style>
 
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js
index d5c9ca17..8fd9ae22 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js
@@ -42,92 +42,117 @@ exports.FeedReader = Montage.create(Component, {
     },
     
     // time in ms between slides
-    interval: {value: 3000, distinct: true},
-    
-    repetition: {enumerable: false, value: null},
+    interval: {value: 3, distinct: true},
 
     maxEntries: {value: 10, distinct: true},
-    entries: {value: null},
-
-
-    _startLoading: {
-        value: function() {
-            //Notifier.show('Loading ... please wait', null, {top: this.element.style.top, left: this.element.style.left + 20});