aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-21 11:27:23 -0700
committerValerio Virgillito2012-03-21 11:27:23 -0700
commit8ee7f05753e84def43c158c30af7ecac68523847 (patch)
tree787605935291dd2225b55e59f24f522155eea6de
parentbabe504e1cdfd98a5df8fd325d54aab72ca3cdb0 (diff)
parent31eee2972667d7553974f0857fdc458954219203 (diff)
downloadninja-8ee7f05753e84def43c158c30af7ecac68523847.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html3
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js14
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 @@
15 "prototype": "montage/ui/picasa-carousel.reel", 15 "prototype": "montage/ui/picasa-carousel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 17 "element": {"#": "montage-google-picasa-carousel"},
18 "searchResultsList": {"@": "searchResultsList"} 18 "searchResultsList": {"@": "searchResultsList"},
19 "flow": {"@": "flow1"}
19 } 20 }
20 }, 21 },
21 "searchResultsController": { 22 "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
20 value: null 20 value: null
21 }, 21 },
22 22
23 flow: {
24 value: null
25 },
26
27 initialPosition: {
28 value: 2300
29 },
30
31
32
23 _queryParameter: { 33 _queryParameter: {
24 enumerable: false, 34 enumerable: false,
25 value: null 35 value: null
@@ -37,7 +47,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
37 47
38 resultCount: { 48 resultCount: {
39 enumerable: false, 49 enumerable: false,
40 value: 20 50 value: 40
41 }, 51 },
42 52
43 prepareForDraw: { 53 prepareForDraw: {
@@ -103,6 +113,8 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
103 value: function(evt) { 113 value: function(evt) {
104 var response = JSON.parse(evt.target.responseText); 114 var response = JSON.parse(evt.target.responseText);
105 this.searchResults = response.feed.entry; 115 this.searchResults = response.feed.entry;
116 this.flow.length = this.initialPosition;
117 this.flow.origin = this.initialPosition;
106 this.isSearching = false; 118 this.isSearching = false;
107 } 119 }
108 }, 120 },