Skip to content

J
jquery
Commit 1ffa984e authored by Jörn Zaefferer's avatar Jörn Zaefferer
Browse files
Options

Added fix for bug #204, yet untested

parent d9ebe848
Hide whitespace changes
Inline Side-by-side
Showing with 3982 additions and 3982 deletions
src/fx/fx.js
View file @ 1ffa984e
jQuery.fn.extend({ jQuery.fn.extend({
// overwrite the old show method // overwrite the old show method
_show: jQuery.fn.show, _show: jQuery.fn.show,
/** /**
* Show all matched elements using a graceful animation. * Show all matched elements using a graceful animation.
* The height, width, and opacity of each of the matched elements * The height, width, and opacity of each of the matched elements
* are changed dynamically according to the specified speed. * are changed dynamically according to the specified speed.
* *
* @example $("p").show("slow"); * @example $("p").show("slow");
* *
* @name show * @name show
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Show all matched elements using a graceful animation and firing a callback * Show all matched elements using a graceful animation and firing a callback
* function after completion. * function after completion.
* The height, width, and opacity of each of the matched elements * The height, width, and opacity of each of the matched elements
* are changed dynamically according to the specified speed. * are changed dynamically according to the specified speed.
* *
* @example $("p").show("slow",function(){ * @example $("p").show("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name show * @name show
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
show: function(speed,callback){ show: function(speed,callback){
return speed ? this.animate({ return speed ? this.animate({
height: "show", width: "show", opacity: "show" height: "show", width: "show", opacity: "show"
}, speed, callback) : this._show(); }, speed, callback) : this._show();
}, },
// Overwrite the old hide method // Overwrite the old hide method
_hide: jQuery.fn.hide, _hide: jQuery.fn.hide,
/** /**
* Hide all matched elements using a graceful animation. * Hide all matched elements using a graceful animation.
* The height, width, and opacity of each of the matched elements * The height, width, and opacity of each of the matched elements
* are changed dynamically according to the specified speed. * are changed dynamically according to the specified speed.
* *
* @example $("p").hide("slow"); * @example $("p").hide("slow");
* *
* @name hide * @name hide
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Hide all matched elements using a graceful animation and firing a callback * Hide all matched elements using a graceful animation and firing a callback
* function after completion. * function after completion.
* The height, width, and opacity of each of the matched elements * The height, width, and opacity of each of the matched elements
* are changed dynamically according to the specified speed. * are changed dynamically according to the specified speed.
* *
* @example $("p").hide("slow",function(){ * @example $("p").hide("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name hide * @name hide
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
hide: function(speed,callback){ hide: function(speed,callback){
return speed ? this.animate({ return speed ? this.animate({
height: "hide", width: "hide", opacity: "hide" height: "hide", width: "hide", opacity: "hide"
}, speed, callback) : this._hide(); }, speed, callback) : this._hide();
}, },
/** /**
* Reveal all matched elements by adjusting their height. * Reveal all matched elements by adjusting their height.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be revealed in a "sliding" manner. * elements to be revealed in a "sliding" manner.
* *
* @example $("p").slideDown("slow"); * @example $("p").slideDown("slow");
* *
* @name slideDown * @name slideDown
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Reveal all matched elements by adjusting their height and firing a callback * Reveal all matched elements by adjusting their height and firing a callback
* function after completion. * function after completion.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be revealed in a "sliding" manner. * elements to be revealed in a "sliding" manner.
* *
* @example $("p").slideDown("slow",function(){ * @example $("p").slideDown("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name slideDown * @name slideDown
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
slideDown: function(speed,callback){ slideDown: function(speed,callback){
return this.animate({height: "show"}, speed, callback); return this.animate({height: "show"}, speed, callback);
}, },
/** /**
* Hide all matched elements by adjusting their height. * Hide all matched elements by adjusting their height.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be hidden in a "sliding" manner. * elements to be hidden in a "sliding" manner.
* *
* @example $("p").slideUp("slow"); * @example $("p").slideUp("slow");
* *
* @name slideUp * @name slideUp
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Hide all matched elements by adjusting their height and firing a callback * Hide all matched elements by adjusting their height and firing a callback
* function after completion. * function after completion.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be hidden in a "sliding" manner. * elements to be hidden in a "sliding" manner.
* *
* @example $("p").slideUp("slow",function(){ * @example $("p").slideUp("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name slideUp * @name slideUp
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
slideUp: function(speed,callback){ slideUp: function(speed,callback){
return this.animate({height: "hide"}, speed, callback); return this.animate({height: "hide"}, speed, callback);
}, },
/** /**
* Toggle the visibility of all matched elements by adjusting their height. * Toggle the visibility of all matched elements by adjusting their height.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be hidden in a "sliding" manner. * elements to be hidden in a "sliding" manner.
* *
* @example $("p").slideToggle("slow"); * @example $("p").slideToggle("slow");
* *
* @name slideToggle * @name slideToggle
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Toggle the visibility of all matched elements by adjusting their height * Toggle the visibility of all matched elements by adjusting their height
* and firing a callback function after completion. * and firing a callback function after completion.
* Only the height is adjusted for this animation, causing all matched * Only the height is adjusted for this animation, causing all matched
* elements to be hidden in a "sliding" manner. * elements to be hidden in a "sliding" manner.
* *
* @example $("p").slideToggle("slow",function(){ * @example $("p").slideToggle("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name slideToggle * @name slideToggle
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
slideToggle: function(speed,callback){ slideToggle: function(speed,callback){
return this.each(function(){ return this.each(function(){
var state = $(this).is(":hidden") ? "show" : "hide"; var state = $(this).is(":hidden") ? "show" : "hide";
$(this).animate({height: state}, speed, callback); $(this).animate({height: state}, speed, callback);
}); });
}, },
/** /**
* Fade in all matched elements by adjusting their opacity. * Fade in all matched elements by adjusting their opacity.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeIn("slow"); * @example $("p").fadeIn("slow");
* *
* @name fadeIn * @name fadeIn
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Fade in all matched elements by adjusting their opacity and firing a * Fade in all matched elements by adjusting their opacity and firing a
* callback function after completion. * callback function after completion.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeIn("slow",function(){ * @example $("p").fadeIn("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name fadeIn * @name fadeIn
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
fadeIn: function(speed,callback){ fadeIn: function(speed,callback){
return this.animate({opacity: "show"}, speed, callback); return this.animate({opacity: "show"}, speed, callback);
}, },
/** /**
* Fade out all matched elements by adjusting their opacity. * Fade out all matched elements by adjusting their opacity.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeOut("slow"); * @example $("p").fadeOut("slow");
* *
* @name fadeOut * @name fadeOut
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Fade out all matched elements by adjusting their opacity and firing a * Fade out all matched elements by adjusting their opacity and firing a
* callback function after completion. * callback function after completion.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeOut("slow",function(){ * @example $("p").fadeOut("slow",function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name fadeOut * @name fadeOut
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
fadeOut: function(speed,callback){ fadeOut: function(speed,callback){
return this.animate({opacity: "hide"}, speed, callback); return this.animate({opacity: "hide"}, speed, callback);
}, },
/** /**
* Fade the opacity of all matched elements to a specified opacity. * Fade the opacity of all matched elements to a specified opacity.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeTo("slow", 0.5); * @example $("p").fadeTo("slow", 0.5);
* *
* @name fadeTo * @name fadeTo
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Number opacity The opacity to fade to (a number from 0 to 1). * @param Number opacity The opacity to fade to (a number from 0 to 1).
* @cat Effects/Animations * @cat Effects/Animations
*/ */
/** /**
* Fade the opacity of all matched elements to a specified opacity and * Fade the opacity of all matched elements to a specified opacity and
* firing a callback function after completion. * firing a callback function after completion.
* Only the opacity is adjusted for this animation, meaning that * Only the opacity is adjusted for this animation, meaning that
* all of the matched elements should already have some form of height * all of the matched elements should already have some form of height
* and width associated with them. * and width associated with them.
* *
* @example $("p").fadeTo("slow", 0.5, function(){ * @example $("p").fadeTo("slow", 0.5, function(){
* alert("Animation Done."); * alert("Animation Done.");
* }); * });
* *
* @name fadeTo * @name fadeTo
* @type jQuery * @type jQuery
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Number opacity The opacity to fade to (a number from 0 to 1). * @param Number opacity The opacity to fade to (a number from 0 to 1).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
fadeTo: function(speed,to,callback){ fadeTo: function(speed,to,callback){
return this.animate({opacity: to}, speed, callback); return this.animate({opacity: to}, speed, callback);
}, },
/** /**
* A function for making your own, custom, animations. The key aspect of * A function for making your own, custom, animations. The key aspect of
* this function is the object of style properties that will be animated, * this function is the object of style properties that will be animated,
* and to what end. Each key within the object represents a style property * and to what end. Each key within the object represents a style property
* that will also be animated (for example: "height", "top", or "opacity"). * that will also be animated (for example: "height", "top", or "opacity").
* *
* The value associated with the key represents to what end the property * The value associated with the key represents to what end the property
* will be animated. If a number is provided as the value, then the style * will be animated. If a number is provided as the value, then the style
* property will be transitioned from its current state to that new number. * property will be transitioned from its current state to that new number.
* Oterwise if the string "hide", "show", or "toggle" is provided, a default * Oterwise if the string "hide", "show", or "toggle" is provided, a default
* animation will be constructed for that property. * animation will be constructed for that property.
* *
* @example $("p").animate({ * @example $("p").animate({
* height: 'toggle', opacity: 'toggle' * height: 'toggle', opacity: 'toggle'
* }, "slow"); * }, "slow");
* *
* @example $("p").animate({ * @example $("p").animate({
* left: 50, opacity: 'show' * left: 50, opacity: 'show'
* }, 500); * }, 500);
* *
* @name animate * @name animate
* @type jQuery * @type jQuery
* @param Hash params A set of style attributes that you wish to animate, and to what end. * @param Hash params A set of style attributes that you wish to animate, and to what end.
* @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param Object speed A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param Function callback A function to be executed whenever the animation completes. * @param Function callback A function to be executed whenever the animation completes.
* @cat Effects/Animations * @cat Effects/Animations
*/ */
animate: function(prop,speed,callback) { animate: function(prop,speed,callback) {
return this.queue(function(){ return this.queue(function(){
this.curAnim = prop; this.curAnim = prop;
for ( var p in prop ) { for ( var p in prop ) {
var e = new jQuery.fx( this, jQuery.speed(speed,callback), p ); var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
if ( prop[p].constructor == Number ) if ( prop[p].constructor == Number )
e.custom( e.cur(), prop[p] ); e.custom( e.cur(), prop[p] );
else else
e[ prop[p] ]( prop ); e[ prop[p] ]( prop );
} }
}); });
}, },
/** /**
* *
* @private * @private
*/ */
queue: function(type,fn){ queue: function(type,fn){
if ( !fn ) { if ( !fn ) {
fn = type; fn = type;
type = "fx"; type = "fx";
} }
return this.each(function(){ return this.each(function(){
if ( !this.queue ) if ( !this.queue )
this.queue = {}; this.queue = {};
if ( !this.queue[type] ) if ( !this.queue[type] )
this.queue[type] = []; this.queue[type] = [];
this.queue[type].push( fn ); this.queue[type].push( fn );
if ( this.queue[type].length == 1 ) if ( this.queue[type].length == 1 )
fn.apply(this); fn.apply(this);
}); });
} }
}); });
jQuery.extend({ jQuery.extend({
setAuto: function(e,p) { setAuto: function(e,p) {
if ( e.notAuto ) return; if ( e.notAuto ) return;
if ( p == "height" && e.scrollHeight != parseInt(jQuery.curCSS(e,p)) ) return; if ( p == "height" && e.scrollHeight != parseInt(jQuery.curCSS(e,p)) ) return;
if ( p == "width" && e.scrollWidth != parseInt(jQuery.curCSS(e,p)) ) return; if ( p == "width" && e.scrollWidth != parseInt(jQuery.curCSS(e,p)) ) return;
// Remember the original height // Remember the original height
var a = e.style[p]; var a = e.style[p];
// Figure out the size of the height right now // Figure out the size of the height right now
var o = jQuery.curCSS(e,p,1); var o = jQuery.curCSS(e,p,1);
if ( p == "height" && e.scrollHeight != o || if ( p == "height" && e.scrollHeight != o ||
p == "width" && e.scrollWidth != o ) return; p == "width" && e.scrollWidth != o ) return;
// Set the height to auto // Set the height to auto
e.style[p] = e.currentStyle ? "" : "auto"; e.style[p] = e.currentStyle ? "" : "auto";
// See what the size of "auto" is // See what the size of "auto" is
var n = jQuery.curCSS(e,p,1); var n = jQuery.curCSS(e,p,1);
// Revert back to the original size // Revert back to the original size
if ( o != n && n != "auto" ) { if ( o != n && n != "auto" ) {
e.style[p] = a; e.style[p] = a;
e.notAuto = true; e.notAuto = true;
} }
}, },
speed: function(s,o) { speed: function(s,o) {
o = o || {}; o = o || {};
if ( o.constructor == Function ) if ( o.constructor == Function )
o = { complete: o }; o = { complete: o };
var ss = { slow: 600, fast: 200 }; var ss = { slow: 600, fast: 200 };
o.duration = (s && s.constructor == Number ? s : ss[s]) || 400; o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;
// Queueing // Queueing
o.oldComplete = o.complete; o.oldComplete = o.complete;
o.complete = function(){ o.complete = function(){
jQuery.dequeue(this, "fx"); jQuery.dequeue(this, "fx");
if ( o.oldComplete && o.oldComplete.constructor == Function ) if ( o.oldComplete && o.oldComplete.constructor == Function )
o.oldComplete.apply( this ); o.oldComplete.apply( this );
}; };
return o; return o;
}, },
queue: {}, queue: {},
dequeue: function(elem,type){ dequeue: function(elem,type){
type = type || "fx"; type = type || "fx";
if ( elem.queue && elem.queue[type] ) { if ( elem.queue && elem.queue[type] ) {
// Remove self // Remove self
elem.queue[type].shift(); elem.queue[type].shift();
// Get next function // Get next function
var f = elem.queue[type][0]; var f = elem.queue[type][0];
if ( f ) f.apply( elem ); if ( f ) f.apply( elem );
} }
}, },
/* /*
* I originally wrote fx() as a clone of moo.fx and in the process * 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. * people. You've been warned.
*/ */
fx: function( elem, options, prop ){ fx: function( elem, options, prop ){
var z = this; var z = this;
// The users options // The users options
z.o = { z.o = {
duration: options.duration || 400, duration: options.duration || 400,
complete: options.complete, complete: options.complete,
step: options.step step: options.step
}; };
// The element // The element
z.el = elem; z.el = elem;
// The styles // The styles
var y = z.el.style; var y = z.el.style;
// Simple function for setting a style value // Simple function for setting a style value
z.a = function(){ z.a = function(){
if ( options.step ) if ( options.step )
options.step.apply( elem, [ z.now ] ); options.step.apply( elem, [ z.now ] );
if ( prop == "opacity" ) { if ( prop == "opacity" ) {
if (jQuery.browser.mozilla && z.now == 1) z.now = 0.9999; if (jQuery.browser.mozilla && z.now == 1) z.now = 0.9999;
if (window.ActiveXObject) if (window.ActiveXObject)
y.filter = "alpha(opacity=" + z.now*100 + ")"; y.filter = "alpha(opacity=" + z.now*100 + ")";
else else
y.opacity = z.now; y.opacity = z.now;
// My hate for IE will never die // My hate for IE will never die
} else if ( parseInt(z.now) ) } else if ( parseInt(z.now) )
y[prop] = parseInt(z.now) + "px"; y[prop] = parseInt(z.now) + "px";
y.display = "block"; y.display = "block";
}; };
// Figure out the maximum number to run to // Figure out the maximum number to run to
z.max = function(){ z.max = function(){
return parseFloat( jQuery.css(z.el,prop) ); return parseFloat( jQuery.css(z.el,prop) );
}; };
// Get the current size // Get the current size
z.cur = function(){ z.cur = function(){
var r = parseFloat( jQuery.curCSS(z.el, prop) ); var r = parseFloat( jQuery.curCSS(z.el, prop) );
return r && r > -10000 ? r : z.max(); return r && r > -10000 ? r : z.max();
}; };
// Start an animation from one number to another // Start an animation from one number to another
z.custom = function(from,to){ z.custom = function(from,to){
z.startTime = (new Date()).getTime(); z.startTime = (new Date()).getTime();
z.now = from; z.now = from;
z.a(); z.a();
z.timer = setInterval(function(){ z.timer = setInterval(function(){
z.step(from, to); z.step(from, to);
}, 13); }, 13);
}; };
// Simple 'show' function // Simple 'show' function
z.show = function( p ){ z.show = function( p ){
if ( !z.el.orig ) z.el.orig = {}; if ( !z.el.orig ) z.el.orig = {};
// Remember where we started, so that we can go back to it later // Remember where we started, so that we can go back to it later
z.el.orig[prop] = this.cur(); z.el.orig[prop] = this.cur();
z.custom( 0, z.el.orig[prop] ); z.custom( 0, z.el.orig[prop] );
// Stupid IE, look what you made me do // Stupid IE, look what you made me do
if ( prop != "opacity" ) if ( prop != "opacity" )
y[prop] = "1px"; y[prop] = "1px";
}; };
// Simple 'hide' function // Simple 'hide' function
z.hide = function(){ z.hide = function(){
if ( !z.el.orig ) z.el.orig = {}; if ( !z.el.orig ) z.el.orig = {};
// Remember where we started, so that we can go back to it later // Remember where we started, so that we can go back to it later
z.el.orig[prop] = this.cur(); z.el.orig[prop] = this.cur();
z.o.hide = true; z.o.hide = true;
// Begin the animation // Begin the animation
z.custom(z.el.orig[prop], 0); z.custom(z.el.orig[prop], 0);
}; };
// IE has trouble with opacity if it does not have layout // IE has trouble with opacity if it does not have layout
if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout ) if ( jQuery.browser.msie && !z.el.currentStyle.hasLayout )
y.zoom = "1"; y.zoom = "1";
// Remember the overflow of the element // Remember the overflow of the element
if ( !z.el.oldOverlay ) if ( !z.el.oldOverlay )
z.el.oldOverflow = jQuery.css( z.el, "overflow" ); z.el.oldOverflow = jQuery.css( z.el, "overflow" );
// Make sure that nothing sneaks out // Make sure that nothing sneaks out
y.overflow = "hidden"; y.overflow = "hidden";
// Each step of an animation // Each step of an animation
z.step = function(firstNum, lastNum){ z.step = function(firstNum, lastNum){
var t = (new Date()).getTime(); var t = (new Date()).getTime();
if (t > z.o.duration + z.startTime) { if (t > z.o.duration + z.startTime) {
// Stop the timer // Stop the timer
clearInterval(z.timer); clearInterval(z.timer);
z.timer = null; z.timer = null;
z.now = lastNum; z.now = lastNum;
z.a(); z.a();
z.el.curAnim[ prop ] = true; z.el.curAnim[ prop ] = true;
var done = true; var done = true;
for ( var i in z.el.curAnim ) for ( var i in z.el.curAnim )
if ( z.el.curAnim[i] !== true ) if ( z.el.curAnim[i] !== true )
done = false; done = false;
if ( done ) { if ( done ) {
// Reset the overflow // Reset the overflow
y.overflow = z.el.oldOverflow; y.overflow = z.el.oldOverflow;
// Hide the element if the "hide" operation was done // Hide the element if the "hide" operation was done
if ( z.o.hide ) if ( z.o.hide )
y.display = 'none'; y.display = 'none';
// Reset the property, if the item has been hidden // Reset the property, if the item has been hidden
if ( z.o.hide ) { if ( z.o.hide ) {
for ( var p in z.el.curAnim ) { for ( var p in z.el.curAnim ) {
y[ p ] = z.el.orig[p] + ( p == "opacity" ? "" : "px" ); y[ p ] = z.el.orig[p] + ( p == "opacity" ? "" : "px" );
// set its height and/or width to auto // set its height and/or width to auto
if ( p == 'height' || p == 'width' ) if ( p == 'height' || p == 'width' )
jQuery.setAuto( z.el, p ); jQuery.setAuto( z.el, p );
} }
} }
} }
// If a callback was provided, execute it // If a callback was provided, execute it
if( done && z.o.complete && z.o.complete.constructor == Function ) if( done && z.o.complete && z.o.complete.constructor == Function )
// Execute the complete function // Execute the complete function
z.o.complete.apply( z.el ); z.o.complete.apply( z.el );
} else { } else {
// Figure out where in the animation we are and set the number // Figure out where in the animation we are and set the number
var p = (t - this.startTime) / z.o.duration; var p = (t - this.startTime) / z.o.duration;
z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum; z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
// Perform the next step of the animation // Perform the next step of the animation
z.a(); z.a();
} }
}; };
} }
}); });
src/jquery/jquery.js
View file @ 1ffa984e
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment