1 files changed, 76 insertions, 51 deletions

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 {
+                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);
+                    //console.log('entries: ', result.feed.entries);                    
                     self.entries = result.feed.entries;
+                    this._activeIndex = 0;
                 }
+                
+                
             });
         }
+    },
+    
+    addEntryAnimation: {
+        value: function() {
+            var self = this;
+            if("animation" == this.feedDisplayMode) {                
+                this.element.addEventListener('animationend', 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('animationend', this);
+            } else {
+                if(this.feedEntryTimer) {
+                    window.clearInterval(this.feedEntryTimer);
+                }
+            }
+        }
+    },
+    
+    handleAnimationend: {
+        value: function() {
+            console.log('animation end');
+            this.activeIndex = this.activeIndex + 1;
+        }
+    },
+    
+    prepareForDraw: {
+        value: function() {
+            this.addEntryAnimation();
+        }
+    },
+    
+    draw: {
+        value: function() {
+            
+        }
     }
 
 });