diff options
author | Eric Guzman | 2012-03-21 12:27:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-21 12:27:43 -0700 |
commit | 33c557491c23e8dcf802bcd15fa500d03e5f115b (patch) | |
tree | 14687e3fb6c21ed119da3d4377e75a2c9e12e04d /node_modules/montage | |
parent | 2a6e1fb035e2403ee2c745e14c5a186920f367d9 (diff) | |
parent | 6f995a7ea1f35632fa54ad007953377bdf119c3a (diff) | |
download | ninja-33c557491c23e8dcf802bcd15fa500d03e5f115b.tar.gz |
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedReaderAnimation
Diffstat (limited to 'node_modules/montage')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.html | 2 | ||||
-rw-r--r-- | node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html index e6c2f5b5..646c87f8 100644 --- a/node_modules/montage/ui/flow.reel/flow.html +++ b/node_modules/montage/ui/flow.reel/flow.html | |||
@@ -35,7 +35,7 @@ | |||
35 | <style> | 35 | <style> |
36 | .montage-flow { | 36 | .montage-flow { |
37 | position: relative; | 37 | position: relative; |
38 | /*overflow: hidden;*/ | 38 | overflow: hidden; |
39 | -webkit-transform: translateZ(0); | 39 | -webkit-transform: translateZ(0); |
40 | } | 40 | } |
41 | .montage-flow-repetition { | 41 | .montage-flow-repetition { |
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 b41df9a6..bdc74c83 100644 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js | |||
@@ -111,10 +111,17 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
111 | 111 | ||
112 | handleSearchRequestLoad: { | 112 | handleSearchRequestLoad: { |
113 | value: function(evt) { | 113 | value: function(evt) { |
114 | var response = JSON.parse(evt.target.responseText); | 114 | var response = JSON.parse(evt.target.responseText), |
115 | previousOrigin = this.flow.origin; | ||
115 | this.searchResults = response.feed.entry; | 116 | this.searchResults = response.feed.entry; |
116 | this.flow.length = this.initialPosition; | 117 | if (this.flow.length === 0) { |
117 | this.flow.origin = this.initialPosition; | 118 | this.flow.length = this.initialPosition; |
119 | } | ||
120 | if (previousOrigin === 0) { | ||
121 | this.flow.origin = this.initialPosition; | ||
122 | } else { | ||
123 | this.flow.origin = previousOrigin; | ||
124 | } | ||
118 | this.isSearching = false; | 125 | this.isSearching = false; |
119 | } | 126 | } |
120 | }, | 127 | }, |