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

2 files changed, 15 insertions, 2 deletions

diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 6774026b..34f207b4 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -15,7 +15,8 @@
             "prototype": "montage/ui/picasa-carousel.reel",
             "properties": {
                 "element": {"#": "montage-google-picasa-carousel"},
-                "searchResultsList": {"@": "searchResultsList"}
+                "searchResultsList": {"@": "searchResultsList"},
+                "flow": {"@": "flow1"}
             }
                 },
             "searchResultsController": {
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index 1f5e7dd0..b41df9a6 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
@@ -20,6 +20,16 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
                 value: null
             },
 
+        flow: {
+            value: null
+        },
+
+        initialPosition: {
+            value: 2300
+        },
+
+
+
         _queryParameter: {
             enumerable: false,
             value: null
@@ -37,7 +47,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
 
             resultCount: {
                 enumerable: false,
-                value: 20
+                value: 40
             },
 
             prepareForDraw: {
@@ -103,6 +113,8 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
                 value: function(evt) {
                     var response = JSON.parse(evt.target.responseText);
                     this.searchResults = response.feed.entry;
+                this.flow.length = this.initialPosition;
+                this.flow.origin = this.initialPosition;
                     this.isSearching = false;
                 }
             },