aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Collapser.js
diff options
context:
space:
mode:
authorJonathan Duran2012-02-06 18:25:15 -0800
committerJonathan Duran2012-02-06 18:25:15 -0800
commitb4dd3e269b9de188e015f4cfac29c70a684f4c4f (patch)
treea9e80178b27128a1bede76b91026e7bfa1a60bf7 /js/panels/Timeline/Collapser.js
parent56a0532ef7c154eb41d9924dd36aee9606b01f75 (diff)
downloadninja-b4dd3e269b9de188e015f4cfac29c70a684f4c4f.tar.gz
Fix problem with resizer set to capture all webkitTransitionEnd events. Update collapser to use namespaced webkitTransitionEnd events for forward compatibility.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Collapser.js')
-rw-r--r--js/panels/Timeline/Collapser.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 2fbe8e83..d286d84c 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -206,6 +206,7 @@ var Montage = require("montage/core/core").Montage,
206 206
207 // Add a handler for the end of the transition, so we can tidy things up after 207 // Add a handler for the end of the transition, so we can tidy things up after
208 // the transition completes 208 // the transition completes
209 this.myContent.identifier = "myContent";
209 this.myContent.addEventListener("webkitTransitionEnd", this, false); 210 this.myContent.addEventListener("webkitTransitionEnd", this, false);
210 211
211 this.myContent.style.overflow = "hidden"; 212 this.myContent.style.overflow = "hidden";
@@ -236,7 +237,7 @@ var Montage = require("montage/core/core").Montage,
236 // Special cases: If transition does not happen (in the case of a contentHeight of 0 237 // Special cases: If transition does not happen (in the case of a contentHeight of 0
237 // or isAnimated = false) we need to manually fire it here to do the cleanup. 238 // or isAnimated = false) we need to manually fire it here to do the cleanup.
238 if ((this.contentHeight < 3) || (!this.isAnimated)) { 239 if ((this.contentHeight < 3) || (!this.isAnimated)) {
239 this.handleWebkitTransitionEnd(); 240 this.handleMyContentWebkitTransitionEnd();
240 } 241 }
241 } 242 }
242 } 243 }
@@ -284,7 +285,7 @@ var Montage = require("montage/core/core").Montage,
284 285
285 // This handler is bound to the transitionEnd event. If transitions 286 // This handler is bound to the transitionEnd event. If transitions
286 // are disabled, it is called manually. 287 // are disabled, it is called manually.
287 handleWebkitTransitionEnd: { 288 handleMyContentWebkitTransitionEnd: {
288 value: function(event) { 289 value: function(event) {
289 290
290 // Are we animating the transitions? 291 // Are we animating the transitions?