o = o || {};
var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400};
o.duration = typeof s == "number" ? s : ss[s] || 400;
+
+ o.oldComplete = o.onComplete;
+ o.onComplete = function(){
+ $.dequeue(this, 'fx');
+ if ( o.oldComplete && o.oldComplete.constructor == Function ) {
+ $.apply( this, o.oldComplete );
+ }
+ };
+
return o;
};
+$.queue = {};
+
+$.dequeue = function(elem,type){
+ type = type || 'fx';
+
+ if ( elem.$$queue && elem.$$queue[type] ) {
+ // Remove self
+ elem.$$queue[type].shift();
+
+ // Get next function
+ var f = elem.$$queue[type][0];
+
+ if ( f ) {
+ $.apply( elem, f );
+ }
+ }
+};
+
+$.fn.queue = function(type,fn){
+ if ( !fn ) {
+ fn = type;
+ type = 'fx';
+ }
+
+ return this.each(function(){
+ if ( !this.$$queue ) {
+ this.$$queue = {};
+ }
+
+ if ( !this.$$queue[type] ) {
+ this.$$queue[type] = [];
+ }
+
+ this.$$queue[type].push( fn );
+
+ if ( this.$$queue[type].length == 1 ) {
+ $.apply(this,fn);
+ }
+ });
+};
+
+$.fn._hide = $.fn.hide;
+
$.fn.hide = function(a,o) {
o = $.speed(a,o);
- return a ? this.each(function(){
- new fx.FadeSize(this,o).hide();
+ return a ? this.queue(function(){
+ new $.fx.FadeSize(this,o).hide();
}) : this._hide();
};
+$.fn._show = $.fn.show;
+
$.fn.show = function(a,o) {
o = $.speed(a,o);
- return a ? this.each(function(){
- new fx.FadeSize(this,o).show();
+ return a ? this.queue(function(){
+ new $.fx.FadeSize(this,o).show();
}) : this._show();
};
$.fn.slideDown = function(a,o) {
o = $.speed(a,o);
- return this.each(function(){
- new fx.Resize(this,o).show("height");
+ return this.queue(function(){
+ new $.fx.Resize(this,o).show("height");
});
};
$.fn.slideUp = function(a,o) {
o = $.speed(a,o);
- return this.each(function(){
- new fx.Resize(this,o).hide("height");
+ return this.queue(function(){
+ new $.fx.Resize(this,o).hide("height");
});
};
$.fn.fadeOut = function(a,o) {
o = $.speed(a,o);
- return a ? this.each(function(){
- new fx.Opacity(this,o).hide();
+ return a ? this.queue(function(){
+ new $.fx.Opacity(this,o,1).hide();
}) : this._hide();
};
$.fn.fadeIn = function(a,o) {
o = $.speed(a,o);
- return a ? this.each(function(){
- new fx.Opacity(this,o).show();
+ return a ? this.queue(function(){
+ new $.fx.Opacity(this,o,1).show();
+ }) : this._show();
+};
+
+$.fn.fadeTo = function(a,ev,o) {
+ o = $.speed(a,o);
+ return a ? this.queue(function(){
+ ef = new $.fx.Opacity(this,o);
+ ef.custom(ef.cur(),parseFloat(ev));
+ ef.show();
}) : this._show();
};
p.style.position = 'relative';
}
s.position = 'absolute';
- s.left = parseInt(($.css(p,"width") - $.css(this,"width"))/2, 10) + "px";
- s.top = parseInt(($.css(p,"height") - $.css(this,"height"))/2, 10) + "px";
+ s.left = (($.css(p,"width") - $.css(this,"width"))/2) + "px";
+ s.top = (($.css(p,"height") - $.css(this,"height"))/2) + "px";
}
});
};
/*
* I originally wrote fx() as a clone of moo.fx and in the process
- * of making it small in size the code became illegible to sane
+ * of making it small in size the code became illegible to sane
* people. You've been warned.
*/
-function fx(el,op,ty,tz){
+$.fx = function(el,op,ty){
+
var z = this;
- z.a = function(){z.el.style[ty]=z.now+z.o.unit;};
- z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur();};
- z.cur = function(){return parseInt($.getCSS(z.el,ty),10);};
- z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max());};
- z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0);};
- z.ss = function(a){if(y.display!=a){y.display=a;}};
- z.toggle = function(){if(z.cur()>0){z.hide();}else{z.show();}};
- z.modify = function(a){z.custom(z.cur(),z.cur()+a);};
- z.clear = function(){clearInterval(z.timer);z.timer=null;};
- z.el = el.constructor==String?document.getElementById(el):el;
- var y = z.el.style;
- z.oo = y.overflow;
- y.overflow = "hidden";
+
+ // The users options
z.o = {
- unit: "px",
duration: (op && op.duration) || 400,
onComplete: (op && op.onComplete) || op
};
- z.step = function(f,tt){
+
+ // The element
+ z.el = el;
+
+ // The styles
+ var y = z.el.style;
+
+ // Simple function for setting a style value
+ z.a = function(){
+ z.el.style[ty] = z.now+'px';
+ };
+
+ // Figure out the maximum number to run to
+ z.max = function(){return z.el["$$orig"+ty]||z.cur();};
+
+ // Get the current size
+ z.cur = function(){return $.css(z.el,ty);};
+
+ // Start an animation from one number to another
+ z.custom = function(from,to){
+ z.startTime = (new Date()).getTime();
+ z.now = from;
+ z.a();
+
+ z.timer = setInterval(function(){
+ z.step(from, to);
+ }, 13);
+ };
+
+ // Simple 'show' function
+ z.show = function(){
+ y.display = "block";
+ z.o.auto = true;
+ z.custom(0,z.max());
+ };
+
+ // Simple 'hide' function
+ z.hide = function(){
+ // Remember where we started, so that we can go back to it later
+ z.el["$$orig"+ty] = this.cur();
+
+ // Begin the animation
+ z.custom(z.cur(),0);
+ };
+
+ // Toggle between showing and hiding an element
+ z.toggle = function(){
+ if ( z.cur() > 0 ) {
+ z.hide();
+ } else {
+ z.show();
+ }
+ };
+
+ // IE has trouble with opacity if it doesn't have layout
+ if ( $.browser == "msie" && !z.el.currentStyle.hasLayout ) {
+ y.zoom = 1;
+ }
+
+ // Remember the overflow of the element
+ z.oldOverflow = y.overflow;
+
+ // Make sure that nothing sneaks out
+ y.overflow = "hidden";
+
+ // Each step of an animation
+ z.step = function(firstNum, lastNum){
var t = (new Date()).getTime();
- var p = (t - z.s) / z.o.duration;
- if (t >= z.o.duration+z.s) {
- z.now = tt;
- z.clear();
- setTimeout(function(){
- y.overflow = z.oo;
- if(y.height=="0px"||y.width=="0px"){z.ss("none");}
- if ( ty != "opacity" && z.o.auto ) {
- $.setAuto( z.el, "height" );
- $.setAuto( z.el, "width" );
+
+ if (t > z.o.duration + z.startTime) {
+ // Stop the timer
+ clearInterval(z.timer);
+ z.timer = null;
+
+ z.now = lastNum;
+ z.a();
+
+ // Reset the overflow
+ y.overflow = z.oldOverflow;
+
+ // If the element was shown, and not using a custom number,
+ // set its height and/or width to auto
+ if ( (ty == "height" || ty == "width") && z.o.auto ) {
+ $.setAuto( z.el, ty );
+ }
+
+ // If a callback was provided, execute it
+ if( z.o.onComplete.constructor == Function ) {
+
+ // Yes, this is a weird place for this, but it needs to be executed
+ // only once per cluster of effects.
+ // If the element is, effectively, hidden - hide it
+ if ( y.height == "0px" || y.width == "0px" ) {
+ y.display = "none";
}
- if(z.o.onComplete.constructor == Function){z.el.$_ = z.o.onComplete;z.el.$_();}
- },13);
+
+ $.apply( z.el, z.o.onComplete );
+ }
} else {
- z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (tt-f) + f;
+ // Figure out where in the animation we are and set the number
+ var p = (t - this.startTime) / z.o.duration;
+ z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
+
+ // Perform the next step of the animation
+ z.a();
}
- z.a();
- };
- z.custom = function(f,t){
- if(z.timer) {return null;}
- this.now=f;z.a();z.io=z.cur();z.s=(new Date()).getTime();
- z.timer=setInterval(function(){z.step(f,t);}, 13);
- };
-}
-fx.fn = ["show","hide","toggle"];
-fx.ty = ["Height","Width","Left","Top"];
-for(var $i in fx.ty){(function(){
- var c = fx.ty[$i];
- fx[c] = function(a,b){
- return new fx(a,b,c.toLowerCase(),c);
};
-})();}
-fx.Opacity = function(a,b){
- var o = new fx(a,b,"opacity");
+
+};
+
+$.fx.fn = ["show","hide","toggle"];
+$.fx.ty = ["Height","Width","Left","Top"];
+
+(function(){
+ for(var $i in $.fx.ty){(function(){
+ var c = $.fx.ty[$i];
+ $.fx[c] = function(a,b){
+ return new $.fx(a,b,c.toLowerCase());
+ };
+ })();}
+})();
+
+$.fx.Opacity = function(a,b,sv){
+ var o = new $.fx(a,b,"opacity");
o.cur = function(){return parseFloat(o.el.style.opacity);};
o.a = function() {
var e = o.el.style;
}
e.opacity = o.now;
};
- o.io = o.now = 1;
+ o.io = o.now = (sv || o.cur());
o.a();
return o;
};
-fx.Resize = function(e,o){
+
+$.fx.Resize = function(e,o){
var z = this;
- var h = new fx.Height(e,o);
+ var h = new $.fx.Height(e,o);
if(o) { o.onComplete = null; }
- var w = new fx.Width(e,o);
- function c(a,b,d){return (!a||a==c||b==d);}
- for(var i in fx.fn){(function(){
- var j = fx.fn[i];
+ var w = new $.fx.Width(e,o);
+ function c(a,b,d){return (!a||a==d||b==d);}
+ for(var i in $.fx.fn){(function(){
+ var j = $.fx.fn[i];
z[j] = function(a,b){
if(c(a,b,"height")) { h[j](); }
if(c(a,b,"width")) { w[j](); }
};
})();}
- z.modify = function(c,d){
- h.modify(c);
- w.modify(d);
- };
};
-fx.FadeSize = function(e,o){
+
+$.fx.FadeSize = function(e,o){
var z = this;
- var r = new fx.Resize(e,o);
+ var r = new $.fx.Resize(e,o);
if(o) { o.onComplete = null; }
- var p = new fx.Opacity(e,o);
- for(var i in fx.fn){(function(){
- var j = fx.fn[i];
+ var p = new $.fx.Opacity(e,o,1);
+ for(var i in $.fx.fn){(function(){
+ var j = $.fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);};
})();}
};
git.asbjorn.biz / jquery.git / blobdiff