this.animate({
height: "show", width: "show", opacity: "show"
}, speed, callback) :
-
+
this.filter(":hidden").each(function(){
- this.style.display = this.oldblock ? this.oldblock : "";
- if ( jQuery.css(this,"display") == "none" )
- this.style.display = "block";
+ this.style.display = this.oldblock || "";
+ if ( jQuery.css(this,"display") == "none" ) {
+ var elem = jQuery("<" + this.tagName + " />").appendTo("body");
+ this.style.display = elem.css("display");
+ // handle an edge condition where css is - div { display:none; } or similar
+ if (this.style.display == "none")
+ this.style.display = "block";
+ elem.remove();
+ }
}).end();
},
-
+
hide: function(speed,callback){
return speed ?
this.animate({
height: "hide", width: "hide", opacity: "hide"
}, speed, callback) :
-
+
this.filter(":visible").each(function(){
this.oldblock = this.oldblock || jQuery.css(this,"display");
- if ( this.oldblock == "none" )
- this.oldblock = "block";
this.style.display = "none";
}).end();
},
// Save the old toggle function
_toggle: jQuery.fn.toggle,
-
+
toggle: function( fn, fn2 ){
return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
- this._toggle( fn, fn2 ) :
+ this._toggle.apply( this, arguments ) :
fn ?
this.animate({
height: "toggle", width: "toggle", opacity: "toggle"
jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
});
},
-
+
slideDown: function(speed,callback){
return this.animate({height: "show"}, speed, callback);
},
-
+
slideUp: function(speed,callback){
return this.animate({height: "hide"}, speed, callback);
},
slideToggle: function(speed, callback){
return this.animate({height: "toggle"}, speed, callback);
},
-
+
fadeIn: function(speed, callback){
return this.animate({opacity: "show"}, speed, callback);
},
-
+
fadeOut: function(speed, callback){
return this.animate({opacity: "hide"}, speed, callback);
},
-
+
fadeTo: function(speed,to,callback){
return this.animate({opacity: to}, speed, callback);
},
-
+
animate: function( prop, speed, easing, callback ) {
- var opt = jQuery.speed(speed, easing, callback);
+ var optall = jQuery.speed(speed, easing, callback);
- return this[ opt.queue === false ? "each" : "queue" ](function(){
- opt = jQuery.extend({}, opt);
- var hidden = jQuery(this).is(":hidden"), self = this;
-
- for ( var p in prop ) {
+ return this[ optall.queue === false ? "each" : "queue" ](function(){
+ if ( this.nodeType != 1)
+ return false;
+
+ var opt = jQuery.extend({}, optall), p,
+ hidden = jQuery(this).is(":hidden"), self = this;
+
+ for ( p in prop ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
- return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+ return opt.complete.call(this);
if ( p == "height" || p == "width" ) {
// Store display property
this.style.overflow = "hidden";
opt.curAnim = jQuery.extend({}, prop);
-
+
jQuery.each( prop, function(name, val){
var e = new jQuery.fx( self, opt, name );
if ( /toggle|show|hide/.test(val) )
e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
else {
- var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
+ var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
start = e.cur(true) || 0;
if ( parts ) {
- end = parseFloat(parts[2]),
- unit = parts[3] || "px";
+ var end = parseFloat(parts[2]),
+ unit = parts[3] || "px";
// We need to compute starting value
if ( unit != "px" ) {
- self.style[ name ] = end + unit;
- start = (end / e.cur(true)) * start;
+ self.style[ name ] = (end || 1) + unit;
+ start = ((end || 1) / e.cur(true)) * start;
self.style[ name ] = start + unit;
}
- // If a +/- token was provided, we're doing a relative animation
+ // If a +=/-= token was provided, we're doing a relative animation
if ( parts[1] )
- end = ((parts[1] == "-" ? -1 : 1) * end) + start;
-
- // Absolutely position numbers
- if( typeof val == "number") end = val;
+ end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
e.custom( start, end, unit );
} else
return true;
});
},
-
+
queue: function(type, fn){
- if ( !fn ) {
+ if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
fn = type;
type = "fx";
}
- if ( !arguments.length )
+ if ( !type || (typeof type == "string" && !fn) )
return queue( this[0], type );
return this.each(function(){
queue(this, type, fn);
else {
queue(this, type).push( fn );
-
+
if ( queue(this, type).length == 1 )
- fn.apply(this);
+ fn.call(this);
}
});
},
- stop: function(){
+ stop: function(clearQueue, gotoEnd){
var timers = jQuery.timers;
- return this.each(function(){
- for ( var i = 0; i < timers.length; i++ )
- if ( timers[i].elem == this )
- timers.splice(i--, 1);
- }).dequeue();
+ if (clearQueue)
+ this.queue([]);
+
+ this.each(function(){
+ // go in reverse order so anything added to the queue during the loop is ignored
+ for ( var i = timers.length - 1; i >= 0; i-- )
+ if ( timers[i].elem == this ) {
+ if (gotoEnd)
+ // force the next step to be the last
+ timers[i](true);
+ timers.splice(i, 1);
+ }
+ });
+
+ // start the next in the queue if the last step wasn't forced
+ if (!gotoEnd)
+ this.dequeue();
+
+ return this;
}
});
var queue = function( elem, type, array ) {
- if ( !elem )
- return;
+ if ( elem ){
+
+ type = type || "fx";
- var q = jQuery.data( elem, type + "queue" );
+ var q = jQuery.data( elem, type + "queue" );
- if ( !q || array )
- q = jQuery.data( elem, type + "queue",
- array ? jQuery.makeArray(array) : [] );
+ if ( !q || array )
+ q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
+ }
return q;
};
q.shift();
if ( q.length )
- q[0].apply( this );
+ q[0].call( this );
});
};
jQuery.extend({
-
+
speed: function(speed, easing, fn) {
var opt = speed && speed.constructor == Object ? speed : {
- complete: fn || !fn && easing ||
+ complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed,
duration: speed,
easing: fn && easing || easing && easing.constructor != Function && easing
};
- opt.duration = (opt.duration && opt.duration.constructor == Number ?
- opt.duration :
- { slow: 600, fast: 200 }[opt.duration]) || 400;
-
+ opt.duration = (opt.duration && opt.duration.constructor == Number ?
+ opt.duration :
+ jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
+
// Queueing
opt.old = opt.complete;
opt.complete = function(){
- jQuery(this).dequeue();
+ if ( opt.queue !== false )
+ jQuery(this).dequeue();
if ( jQuery.isFunction( opt.old ) )
- opt.old.apply( this );
+ opt.old.call( this );
};
-
+
return opt;
},
-
+
easing: {
linear: function( p, n, firstNum, diff ) {
return firstNum + diff * p;
return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
}
},
-
+
timers: [],
+ timerId: null,
fx: function( elem, options, prop ){
this.options = options;
// Simple function for setting a style value
update: function(){
if ( this.options.step )
- this.options.step.apply( this.elem, [ this.now, this ] );
+ this.options.step.call( this.elem, this.now, this );
(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
return this.elem[ this.prop ];
- var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
- return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+ var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+ return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
},
// Start an animation from one number to another
custom: function(from, to, unit){
- this.startTime = (new Date()).getTime();
+ this.startTime = now();
this.start = from;
this.end = to;
this.unit = unit || this.unit || "px";
this.update();
var self = this;
- function t(){
- return self.step();
+ function t(gotoEnd){
+ return self.step(gotoEnd);
}
t.elem = this.elem;
jQuery.timers.push(t);
- if ( jQuery.timers.length == 1 ) {
- var timer = setInterval(function(){
+ if ( jQuery.timerId == null ) {
+ jQuery.timerId = setInterval(function(){
var timers = jQuery.timers;
-
+
for ( var i = 0; i < timers.length; i++ )
if ( !timers[i]() )
timers.splice(i--, 1);
- if ( !timers.length )
- clearInterval( timer );
+ if ( !timers.length ) {
+ clearInterval( jQuery.timerId );
+ jQuery.timerId = null;
+ }
}, 13);
}
},
// flash of content
if ( this.prop == "width" || this.prop == "height" )
this.elem.style[this.prop] = "1px";
-
+
// Start by showing the element
jQuery(this.elem).show();
},
},
// Each step of an animation
- step: function(){
- var t = (new Date()).getTime();
+ step: function(gotoEnd){
+ var t = now();
- if ( 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();
if ( this.options.display != null ) {
// Reset the overflow
this.elem.style.overflow = this.options.overflow;
-
+
// Reset the display
this.elem.style.display = this.options.display;
if ( jQuery.css(this.elem, "display") == "none" )
}
// If a callback was provided, execute it
- if ( done && jQuery.isFunction( this.options.complete ) )
+ if ( done )
// Execute the complete function
- this.options.complete.apply( this.elem );
+ this.options.complete.call( this.elem );
return false;
} else {
};
-jQuery.fx.step = {
- scrollLeft: function(fx){
- fx.elem.scrollLeft = fx.now;
+jQuery.extend( jQuery.fx, {
+ speeds:{
+ slow: 600,
+ fast: 200,
+ // Default speed
+ def: 400
},
+ step: {
+ scrollLeft: function(fx){
+ fx.elem.scrollLeft = fx.now;
+ },
- scrollTop: function(fx){
- fx.elem.scrollTop = fx.now;
- },
+ scrollTop: function(fx){
+ fx.elem.scrollTop = fx.now;
+ },
- opacity: function(fx){
- jQuery.attr(fx.elem.style, "opacity", fx.now);
- },
+ opacity: function(fx){
+ jQuery.attr(fx.elem.style, "opacity", fx.now);
+ },
- _default: function(fx){
- fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+ _default: function(fx){
+ fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+ }
}
-};
+});
git.asbjorn.biz / jquery.git / blobdiff