aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-21 13:25:01 -0700
committerValerio Virgillito2012-03-21 13:25:01 -0700
commit3888d7bce9bc9936cad2db4ed6e2f05b87265515 (patch)
treeae6acabdf89248cdb6748eb5d58dbcf96639ed37
parent3f71deb9b8d1c99dbcf8c8a251903dab7c92dce0 (diff)
parent33c557491c23e8dcf802bcd15fa500d03e5f115b (diff)
downloadninja-3888d7bce9bc9936cad2db4ed6e2f05b87265515.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
-rw-r--r--js/panels/presets/default-style-presets.js18
-rw-r--r--node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.html1
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html2
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js13
4 files changed, 29 insertions, 5 deletions
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 3677d976..82bec34f 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -67,6 +67,24 @@ exports.stylePresets = {
67 "text-shadow": "1px 1px 3px #333" 67 "text-shadow": "1px 1px 3px #333"
68 } 68 }
69 }] 69 }]
70 },
71 {
72 "text": "White Sans-Serif",
73 "selectorBase" : "white-sans-serif",
74 "rules" : [{
75 "selectorSuffix" : "",
76 "styles" : {
77 "color": "#FFFFFF",
78 "font-family": "helvetica,arial,sans-serif"
79 }
80 },
81 {
82 "selectorSuffix" : " h2",
83 "styles" : {
84 "color": "#C1C1C1",
85 "font-family": "helvetica,arial,sans-serif"
86 }
87 }]
70 }] 88 }]
71 }] 89 }]
72}; \ No newline at end of file 90}; \ No newline at end of file
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 },