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

4 files changed, 118 insertions, 86 deletions

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});
-        }
-    },
-
-    _stopLoading: {
-        value: function() {
-            //Notifier.hide();
-        }
-    },
     
+    entries: {value: null},
     
-    feedEntryTimer: {enumerable: false, value: null},
-    _items: {
-        value: null
-    },
-    items: {
+    _feedDisplayMode: {value: null},
+    feedDisplayMode: {
         get: function() {
-            return this._items;
+            return this._feedDisplayMode;
         },
         set: function(value) {
-            this._items = value;
-            // reset the counter
-            console.log('got items');
-            this.activeIndex = 0;
-            
-            if(this.feedEntryTimer) {
-                window.clearInterval(this.feedEntryTimer);
-            }
-            var self = this, maxEntries = self.maxEntries;
-            
-            this.feedEntryTimer = setInterval(function() {
-                var index = self.activeIndex + 1;
-                if(index > maxEntries) {
-                    index = 0;
-                }
-                if(index < 0) {
-                    index = 0;
-                }
-                self.activeIndex = index;
-                
-            }, this.interval);
+            this._feedDisplayMode = value;            
         }
     },
     
+    
+    feedEntryTimer: {enumerable: false, value: null},
+
+    
+    activeFeedEntry: {value: null},
     _activeIndex: {value: null},
     activeIndex: {
         get: function() {
             return this._activeIndex || 0;
         },
-        set: function(value) {
-            this._activeIndex = value;
-            this.repetition.activeIndexes = [value];
+        set: function(index) {                       
+            if(this.entries) {
+                var max = this.entries.length-1;
+                if(index > max) {
+                    index = 0;
+                }
+                if(index < 0) {
+                    index = 0;
+                }
+                this._activeIndex = index;  
+                this.activeFeedEntry = this.entries[this._activeIndex];                             
+            } else {
+