diff options
author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /node_modules/montage-google/picasa-carousel.reel | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel')
-rw-r--r-- | node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js index 800e073c..0b669b80 100644 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js | |||
@@ -138,13 +138,20 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len | |||
138 | 138 | ||
139 | draw: { | 139 | draw: { |
140 | value: function() { | 140 | value: function() { |
141 | 141 | ||
142 | if (this.isSearching) { | 142 | if (this.isSearching) { |
143 | this.element.classList.add("searching"); | 143 | this.element.classList.add("searching"); |
144 | } else { | 144 | } else { |
145 | this.element.classList.remove("searching"); | 145 | this.element.classList.remove("searching"); |
146 | } | 146 | } |
147 | 147 | ||
148 | } | ||
149 | }, | ||
150 | |||
151 | serializeProperties: { | ||
152 | value: function(serializer) { | ||
153 | serializer.set("element", this.element); | ||
154 | serializer.set("queryParameter", this.queryParameter); | ||
148 | } | 155 | } |
149 | } | 156 | } |
150 | 157 | ||