Skip to content

Commit d8b8816

Browse files
committedJan 30, 2015
Updated duration option check to test for a valid string.
1 parent c8cb890 commit d8b8816

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎Source/Fx.CSS3.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ provides: [Fx.Tween.CSS3, Fx.Morph.CSS3, Fx.Elements.CSS3]
182182
}.bind(this);
183183

184184
this.element.addEvent(Fx.CSS3Funcs.css3Features.transitionend, this.boundComplete);
185-
186185
var trans = function(){
187186
var transStyles = {};
188187
transStyles[Fx.CSS3Funcs.css3Features.transitionProperty] =
189188
properties.reduce(function(a, b) { return a + ', ' + b; });
190-
transStyles[Fx.CSS3Funcs.css3Features.transitionDuration] = this.options.duration + 'ms';
189+
// check if duration is a valid string or number
190+
transStyles[Fx.CSS3Funcs.css3Features.transitionDuration] = (Fx.Durations[this.options.duration] || this.options.duration.toInt() || 500) + 'ms';
191191
transStyles[Fx.CSS3Funcs.css3Features.transitionTimingFunction] =
192192
'cubic-bezier(' + Fx.CSS3Funcs.transitionTimings[this.options.transition] + ')';
193193
this.element.setStyles(transStyles);

0 commit comments

Comments
 (0)