Skip to content
Permalink
Browse files

jquery fx: closes #3495. Animations are synchronous when duration is 0.

  • Loading branch information
flesler committed Oct 18, 2008
1 parent aa9236e commit 4add9fa9896be80364b2a97abc8bb5b5a6eb3e89
Showing with 4 additions and 6 deletions.
  1. +4 −6 src/fx.js
@@ -208,9 +208,8 @@ jQuery.extend({
easing: fn && easing || easing && easing.constructor != Function && easing
};

opt.duration = (opt.duration && opt.duration.constructor == Number ?
opt.duration :
jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds._default;
opt.duration = typeof opt.duration == 'number' ? opt.duration :
jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;

// Queueing
opt.old = opt.complete;
@@ -278,7 +277,6 @@ jQuery.fx.prototype = {
this.unit = unit || this.unit || "px";
this.now = this.start;
this.pos = this.state = 0;
this.update();

var self = this;
function t(gotoEnd){
@@ -289,7 +287,7 @@ jQuery.fx.prototype = {

jQuery.timers.push(t);

if ( jQuery.timerId == null ) {
if ( t() && jQuery.timerId == null ) {
jQuery.timerId = setInterval(function(){
var timers = jQuery.timers;

@@ -337,7 +335,7 @@ jQuery.fx.prototype = {
step: function(gotoEnd){
var t = now();

if ( gotoEnd || t > this.options.duration + this.startTime ) {
if ( gotoEnd || t >= this.options.duration + this.startTime ) {
this.now = this.end;
this.pos = this.state = 1;
this.update();

0 comments on commit 4add9fa

Please sign in to comment.
You can’t perform that action at this time.