5 files changed, 89 insertions, 61 deletions

diff --git a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
index 213b4602..6c3a5298 100644
--- a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html
@@ -61,7 +61,6 @@
        .feed-entry {
            padding: 10px;
            margin: 3px 0;
-           border: 1px solid #aaa;
        }
        .feed-entry h2 {
            font-size: 24px;
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 a3523001..646fd01e 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
@@ -53,7 +53,15 @@
         "module": "montage/ui/feed-reader/feed-reader.reel",
         "name": "FeedReader",
         "properties": {
-            "element": {"#": "feed-reader"}
+            "element": {"#": "feed-reader"},
+            "repetition": {"@": "repetition"}
+        },
+        "bindings": {
+            "items": {
+                "boundObject": {"@": "repetition"},
+                "boundObjectPropertyPath": "objects",
+                "oneway": true
+            }
         }
     }
     
@@ -61,8 +69,20 @@
     </script>
 
     <style>
-       .feed-reader {
-           padding: 10px;
+       div.feed-reader  {
+           padding: 10px;          
+       }
+       
+       .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 838a957d..d5c9ca17 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
@@ -40,7 +40,13 @@ exports.FeedReader = Montage.create(Component, {
             this._fetchFeed();
         }
     },
+    
+    // time in ms between slides
+    interval: {value: 3000, distinct: true},
+    
+    repetition: {enumerable: false, value: null},
 
+    maxEntries: {value: 10, distinct: true},
     entries: {value: null},
 
 
@@ -55,6 +61,51 @@ exports.FeedReader = Montage.create(Component, {
             //Notifier.hide();
         }
     },
+    
+    
+    feedEntryTimer: {enumerable: false, value: null},
+    _items: {
+        value: null
+    },
+    items: {
+        get: function() {
+            return this._items;
+        },
+        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);
+        }
+    },
+    
+    _activeIndex: {value: null},
+    activeIndex: {
+        get: function() {
+            return this._activeIndex || 0;
+        },
+        set: function(value) {
+            this._activeIndex = value;
+            this.repetition.activeIndexes = [value];
+        }
+    },
 
     _fetchFeed: {
         value: function() {
diff --git a/node_modules/montage/ui/map.reel/map.html b/node_modules/montage/ui/map.reel/map.html
index 5cd3a5b5..b255ac1e 100644
--- a/node_modules/montage/ui/map.reel/map.html
+++ b/node_modules/montage/ui/map.reel/map.html
@@ -13,24 +13,13 @@
 
     <script type="text/montage-serialization">
     {
-        "types": {
-            "prototype": "montage/ui/select-input.reel",
-            "properties": {
-                "element": {"#": "types"}
-            }
-        },
+        
         "owner": {
             "prototype": "montage/ui/map.reel",
             "properties": {
                 "element": {"#": "map-container"},
                 "mapEl": {"#": "map"}
-            },
-            "bindings": {
-                "category": {
-                    "boundObject": {"@": "types"},
-                    "boundObjectPropertyPath": "value"
-                }
-            }
+            }            
         }
     }
     </script>
@@ -49,20 +38,8 @@
 </head>
 <body>
     
-    <div data-montage-id="map-container">
-        <div>
-            Show: 
-            <select data-montage-id="types">
-                <option value=''>Select a Category</option>
-                <option value='cafe'>Coffee</option>
-                <option value='hospital'>Hospitals</option>
-                <option value='museum'>Museums</option>
-                <option value='restaurant'>Restaurants</option>
-                
-            </select>
-        </div>
-        <div data-montage-id="map" id="map" class="montage-google-map">MAP</div>
-        
+    <div data-montage-id="map-container">        
+        <div data-montage-id="map" id="map" class="montage-google-map">MAP</div>        
     </div>
 
 </body>
diff --git a/node_modules/montage/ui/map.reel/map.js b/node_modules/montage/ui/map.reel/map.js
index c03d51c5..305ae181 100644
--- a/node_modules/montage/ui/map.reel/map.js
+++ b/node_modules/montage/ui/map.reel/map.js
@@ -42,34 +42,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
         enumerable: false,
         value: false
     },
-    _latitude: {
-        enumerable: false,
-        value: -34.397
-    },
-    latitude: {
-        enumerable: false,
-        set: function(value) {
-            this._latitude = value;
-            this.needsDraw = true;
-        },
-        get: function() {
-            return this._latitude;
-        }
-    },
-    _longitude: {
-        enumerable: false,
-        value: -34.397
+