10 files changed, 125 insertions, 61 deletions

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..ef4fc92a 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -79,6 +79,13 @@
             "element": {"#": "map"}
         }
     },
+    
+    "types": {
+        "prototype": "montage/ui/select-input.reel",
+        "properties": {
+            "element": {"#": "types"}
+        }
+    },
 
     "owner": {
         "module": "main.reel",
@@ -92,6 +99,10 @@
             "mapCenter": {
                 "boundObject": {"@": "mapCenter"},
                 "boundObjectPropertyPath": "value"
+            },
+            "mapCategory": {
+                "boundObject": {"@": "types"},
+                "boundObjectPropertyPath": "value"
             }
         }
     }
@@ -140,6 +151,10 @@
             visibility: hidden;
         }
         
+        #map, #feed-reader {
+            margin-top: 10px;
+        }
+        
 
     </style>
 
@@ -168,6 +183,17 @@
                     <form>
                         Location: <input type="text" value="Paris, France" id="map-center" required />
                         <input type="button" id="btn-map" class="btn primary" value="OK"></button>
+                        <div>
+                            Show: 
+                            <select data-montage-id="types">
+                                <option value=''>Select a Category</option>
+                                <option value='grocery_or_supermarket'>Groceries/Supermarkets</option>
+                                <option value='hospital'>Hospitals</option>
+                                <option value='restaurant'>Restaurants</option>
+                                <option value='bar'>Bars</option>
+                                <option value='gas_station'>Gas Stations</option>
+                            </select>
+                        </div>
                     </form>
                 </div>
                 <div id="map">Map</div>
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.js b/node_modules/montage/examples/feed-reader/main.reel/main.js
index bea5f91a..06d8fdba 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.js
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.js
@@ -13,6 +13,16 @@ exports.Main = Montage.create(Component, {
         distinct: true
     },
     
+    mapCategory: {
+        get: function() {
+            return this._mapCategory;
+        },
+        set: function(value) {
+            this._mapCategory = value;
+            this.map.category = value;
+        }
+    },
+    
     feedReader: {value: null},
     
     map: {value: null},
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);
+            }