diff options
Diffstat (limited to 'node_modules/montage/ui')
3 files changed, 11 insertions, 5 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 b78d2516..15dc7eb0 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 | |||
@@ -69,7 +69,6 @@ | |||
69 | margin-bottom: 12px; | 69 | margin-bottom: 12px; |
70 | } | 70 | } |
71 | .feed-entry .entry-title { | 71 | .feed-entry .entry-title { |
72 | color: #404040; | ||
73 | font-weight: bold; | 72 | font-weight: bold; |
74 | } | 73 | } |
75 | .feed-entry .entry-url { | 74 | .feed-entry .entry-url { |
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 | }, |