aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 16:06:25 -0700
committerValerio Virgillito2012-03-20 16:06:25 -0700
commit94f1733599c36befb432dbe0a74e576f649327c8 (patch)
tree430c617a95522e3e0fd66295ed6fe39e29d21119 /node_modules
parent8e8200b4bbad52afe8af362f1e987bce41e4a664 (diff)
parentf9b1e642b7b6c4b48ba1397edeb341a532cad58c (diff)
downloadninja-94f1733599c36befb432dbe0a74e576f649327c8.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.js3
1 files changed, 2 insertions, 1 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 0d5d7bb1..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
@@ -107,7 +107,8 @@ exports.FeedReader = Montage.create(Component, {
107 //console.log('entries: ', result.feed.entries); 107 //console.log('entries: ', result.feed.entries);
108 self.addEntryAnimation(); 108 self.addEntryAnimation();
109 self.entries = result.feed.entries; 109 self.entries = result.feed.entries;
110 this._activeIndex = 0; 110 self.activeIndex = 0;
111
111 } 112 }
112 113
113 114