Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration

4 files changed, 108 insertions, 31 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-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 a3523001..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,11 +32,11 @@
         },
         "bindings": {
             "entry": {
-                "boundObject": {"@": "repetition"},
-                "boundObjectPropertyPath": "objectAtCurrentIteration",
+                "boundObject": {"@": "owner"},
+                "boundObjectPropertyPath": "activeFeedEntry",
                 "oneway": true
             }
-        }
+        }        
     },
     
     "owner": {
@@ -54,17 +44,21 @@
         "name": "FeedReader",
         "properties": {
             "element": {"#": "feed-reader"}
-        }
+        }        
     }
     
 }
     </script>
 
     <style>
-       .feed-reader {
-           padding: 10px;
+       div.feed-reader  {
+           padding: 10px;          
        }
        
+       .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..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
@@ -40,43 +40,119 @@ exports.FeedReader = Montage.create(Component, {
             this._fetchFeed();
         }
     },
+    
+    // time in ms between slides
+    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});
+    
+    _feedDisplayMode: {value: null},
+    feedDisplayMode: {
+        get: function() {
+            return this._feedDisplayMode;
+        },
+        set: function(value) {
+            this._feedDisplayMode = value;            
         }
     },
+    
+    
+    feedEntryTimer: {enumerable: false, value: null},
 
-    _stopLoading: {
-        value: function() {
-            //Notifier.hide();
+    
+    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);
+                    //console.log('entries: ', result.feed.entries);                    
                     self.entries = result.feed.entries;
+                    this._activeIndex = 0;
                 }
+                </