2 files changed, 120 insertions, 26 deletions

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..56523984 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,11 +32,11 @@
         },
         "bindings": {
             "entry": {
-                "boundObject": {"@": "repetition"},
-                "boundObjectPropertyPath": "objectAtCurrentIteration",
+                "boundObject": {"@": "owner"},
+                "boundObjectPropertyPath": "activeFeedEntry",
                 "oneway": true
             }
-        }
+        }        
     },
     
     "owner": {
@@ -54,17 +44,23 @@
         "name": "FeedReader",
         "properties": {
             "element": {"#": "feed-reader"}
-        }
+        }        
     }
     
 }
     </script>
 
     <style>
-       .feed-reader {
-           padding: 10px;
+       div.feed-reader  {
+           /*padding: 2px;*/
+           height: 120px;
+           width: 380px;
        }
        
+       .feed-entry {
+       }
+       
+       
     </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..cc652417 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
@@ -41,42 +41,140 @@ exports.FeedReader = Montage.create(Component, {
         }
     },
 
+    // time in ms between slides
+    interval: {value: 3, distinct: true},
+
+    maxEntries: {value: 10, distinct: true},
+
     entries: {value: null},
 
+    _feedDisplayMode: {value: null},
+    feedDisplayMode: {
+        get: function() {
+            return this._feedDisplayMode;
+        },
+        set: function(value) {
 
-    _startLoading: {
-        value: function() {
-            //Notifier.show('Loading ... please wait', null, {top: this.element.style.top, left: this.element.style.left + 20});
+            this.removeEntryAnimation();
+            this._feedDisplayMode = value;
+
+            this.addEntryAnimation();
         }
     },
 
-    _stopLoading: {
-        value: function() {
-            //Notifier.hide();
+
+    feedEntryTimer: {enumerable: false, value: null},
+
+
+    activeFeedEntry: {value: null},
+    _activeIndex: {value: null},
+    activeIndex: {
+        get: function() {
+            return this._activeIndex || 0;
+        },
+        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 {
+                this._activeIndex = 0;
+            }
         }
     },
 
     _fetchFeed: {
         value: function() {
+
             var url = this.feedURL;
             var feed = new google.feeds.Feed(url);
             feed.setNumEntries(10);
 
             var self = this;
-
-            this._startLoading();
             self.entries = [];
 
             feed.load(function(result) {
-                self._stopLoading();
+                self.removeEntryAnimation();
                 if(result.error) {
                     self.entries = [];
                 } else {
                     //console.log('entries: ', result.feed.entries);
+                    self.addEntryAnimation();
                     self.entries = result.feed.entries;
+                    self.activeIndex = 0;
+                    
                 }
+
+
             });
         }
+    },
+
+    addEntryAnimation: {
+        value: function() {
+            var self = this;
+            if("animation" == this.feedDisplayMode) {
+                this.element.addEventListener('webkitAnimationStart', this);
+                this.element.addEventListener('webkitAnimationIteration', this);
+                this.element.addEventListener('webkitAnimationEnd', this);
+            } else {
+                // timer
+                this.feedEntryTimer = setInterval(function() {
+                    self.activeIndex = self.activeIndex + 1;
+                }, (this.interval * 1000));
+            }
+        }
+    },
+
+    removeEntryAnimation: {
+        value: function() {
+            if("animation" == this.feedDisplayMode) {
+                this.element.removeEventListener('webkitAnimationStart', this);
+                this.element.removeEventListener('webkitAnimationIteration', this);
+                this.element.removeEventListener('webkitAnimationEnd', this);
+
+            } else {
+                if(this.feedEntryTimer) {
+                    window.clearInterval(this.feedEntryTimer);
+                }
+            }