diff options
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Collapser.js | 5 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 2 |
3 files changed, 5 insertions, 4 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? |
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index f10ad842..c6f29626 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html | |||
@@ -33,7 +33,7 @@ | |||
33 | } | 33 | } |
34 | }, | 34 | }, |
35 | "hottextunit" : { | 35 | "hottextunit" : { |
36 | "module" : "montage/ui/hottextunit.reel", | 36 | "module" : "js/components/hottextunit.reel", |
37 | "name" : "HotTextUnit", | 37 | "name" : "HotTextUnit", |
38 | "properties" : { | 38 | "properties" : { |
39 | "element" : {"#":"value-editor-hottext"} | 39 | "element" : {"#":"value-editor-hottext"} |
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index 13a5db3e..796385d0 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -521,7 +521,7 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
521 | "property" : "text-indent", | 521 | "property" : "text-indent", |
522 | "tweener" : "hottext", | 522 | "tweener" : "hottext", |
523 | "units" : "px", | 523 | "units" : "px", |
524 | "min" : 0, | 524 | "min" : -9999, |
525 | "max" : 9999, | 525 | "max" : 9999, |
526 | "default" : 0 | 526 | "default" : 0 |
527 | }, | 527 | }, |