-jQuery.fn.extend({\r
-\r
- // overwrite the old show method\r
- _show: jQuery.fn.show,\r
- \r
- /**\r
- * Show all matched elements using a graceful animation and firing an\r
- * optional callback after completion.\r
- *\r
- * The height, width, and opacity of each of the matched elements \r
- * are changed dynamically according to the specified speed.\r
- *\r
- * @example $("p").show("slow");\r
- *\r
- * @example $("p").show("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name show\r
- * @type jQuery\r
- * @param String|Number 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see hide(String|Number,Function)\r
- */\r
- show: function(speed,callback){\r
- return speed ? this.animate({\r
- height: "show", width: "show", opacity: "show"\r
- }, speed, callback) : this._show();\r
- },\r
- \r
- // Overwrite the old hide method\r
- _hide: jQuery.fn.hide,\r
- \r
- /**\r
- * Hide all matched elements using a graceful animation and firing an\r
- * optional callback after completion.\r
- *\r
- * The height, width, and opacity of each of the matched elements \r
- * are changed dynamically according to the specified speed.\r
- *\r
- * @example $("p").hide("slow");\r
- *\r
- * @example $("p").hide("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name hide\r
- * @type jQuery\r
- * @param String|Number 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see show(String|Number,Function)\r
- */\r
- hide: function(speed,callback){\r
- return speed ? this.animate({\r
- height: "hide", width: "hide", opacity: "hide"\r
- }, speed, callback) : this._hide();\r
- },\r
- \r
- /**\r
- * Reveal all matched elements by adjusting their height and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the height is adjusted for this animation, causing all matched\r
- * elements to be revealed in a "sliding" manner.\r
- *\r
- * @example $("p").slideDown("slow");\r
- *\r
- * @example $("p").slideDown("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name slideDown\r
- * @type jQuery\r
- * @param String|Number speed (optional) 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see slideUp(String|Number,Function)\r
- * @see slideToggle(String|Number,Function)\r
- */\r
- slideDown: function(speed,callback){\r
- return this.animate({height: "show"}, speed, callback);\r
- },\r
- \r
- /**\r
- * Hide all matched elements by adjusting their height and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the height is adjusted for this animation, causing all matched\r
- * elements to be hidden in a "sliding" manner.\r
- *\r
- * @example $("p").slideUp("slow");\r
- *\r
- * @example $("p").slideUp("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name slideUp\r
- * @type jQuery\r
- * @param String|Number speed (optional) 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see slideDown(String|Number,Function)\r
- * @see slideToggle(String|Number,Function)\r
- */\r
- slideUp: function(speed,callback){\r
- return this.animate({height: "hide"}, speed, callback);\r
- },\r
-\r
- /**\r
- * Toggle the visibility of all matched elements by adjusting their height and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the height is adjusted for this animation, causing all matched\r
- * elements to be hidden in a "sliding" manner.\r
- *\r
- * @example $("p").slideToggle("slow");\r
- *\r
- * @example $("p").slideToggle("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name slideToggle\r
- * @type jQuery\r
- * @param String|Number speed (optional) 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see slideDown(String|Number,Function)\r
- * @see slideUp(String|Number,Function)\r
- */\r
- slideToggle: function(speed, callback){\r
- return this.each(function(){\r
- var state = jQuery(this).is(":hidden") ? "show" : "hide";\r
- jQuery(this).animate({height: state}, speed, callback);\r
- });\r
- },\r
- \r
- /**\r
- * Fade in all matched elements by adjusting their opacity and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the opacity is adjusted for this animation, meaning that\r
- * all of the matched elements should already have some form of height\r
- * and width associated with them.\r
- *\r
- * @example $("p").fadeIn("slow");\r
- *\r
- * @example $("p").fadeIn("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name fadeIn\r
- * @type jQuery\r
- * @param String|Number speed (optional) 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see fadeOut(String|Number,Function)\r
- * @see fadeTo(String|Number,Number,Function)\r
- */\r
- fadeIn: function(speed, callback){\r
- return this.animate({opacity: "show"}, speed, callback);\r
- },\r
- \r
- /**\r
- * Fade out all matched elements by adjusting their opacity and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the opacity is adjusted for this animation, meaning that\r
- * all of the matched elements should already have some form of height\r
- * and width associated with them.\r
- *\r
- * @example $("p").fadeOut("slow");\r
- *\r
- * @example $("p").fadeOut("slow",function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name fadeOut\r
- * @type jQuery\r
- * @param String|Number speed (optional) 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).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see fadeIn(String|Number,Function)\r
- * @see fadeTo(String|Number,Number,Function)\r
- */\r
- fadeOut: function(speed, callback){\r
- return this.animate({opacity: "hide"}, speed, callback);\r
- },\r
- \r
- /**\r
- * Fade the opacity of all matched elements to a specified opacity and firing an\r
- * optional callback after completion.\r
- *\r
- * Only the opacity is adjusted for this animation, meaning that\r
- * all of the matched elements should already have some form of height\r
- * and width associated with them.\r
- *\r
- * @example $("p").fadeTo("slow", 0.5);\r
- *\r
- * @example $("p").fadeTo("slow", 0.5, function(){\r
- * alert("Animation Done.");\r
- * });\r
- *\r
- * @name fadeTo\r
- * @type jQuery\r
- * @param String|Number 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).\r
- * @param Number opacity The opacity to fade to (a number from 0 to 1).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- * @see fadeIn(String|Number,Function)\r
- * @see fadeOut(String|Number,Function)\r
- */\r
- fadeTo: function(speed,to,callback){\r
- return this.animate({opacity: to}, speed, callback);\r
- },\r
- \r
- /**\r
- * A function for making your own, custom, animations. The key aspect of\r
- * this function is the object of style properties that will be animated,\r
- * and to what end. Each key within the object represents a style property\r
- * that will also be animated (for example: "height", "top", or "opacity").\r
- *\r
- * The value associated with the key represents to what end the property\r
- * will be animated. If a number is provided as the value, then the style\r
- * property will be transitioned from its current state to that new number.\r
- * Oterwise if the string "hide", "show", or "toggle" is provided, a default\r
- * animation will be constructed for that property.\r
- *\r
- * @example $("p").animate({\r
- * height: 'toggle', opacity: 'toggle'\r
- * }, "slow");\r
- *\r
- * @example $("p").animate({\r
- * left: 50, opacity: 'show'\r
+jQuery.fn.extend({
+
+ /**
+ * Displays each of the set of matched elements if they are hidden.
+ *
+ * @example $("p").show()
+ * @before <p style="display: none">Hello</p>
+ * @result [ <p style="display: block">Hello</p> ]
+ *
+ * @name show
+ * @type jQuery
+ * @cat Effects
+ */
+
+ /**
+ * Show all matched elements using a graceful animation and firing an
+ * optional callback after completion.
+ *
+ * The height, width, and opacity of each of the matched elements
+ * are changed dynamically according to the specified speed.
+ *
+ * @example $("p").show("slow");
+ *
+ * @example $("p").show("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name show
+ * @type jQuery
+ * @param String|Number 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see hide(String|Number,Function)
+ */
+ show: function(speed,callback){
+ return speed ?
+ this.animate({
+ height: "show", width: "show", opacity: "show"
+ }, speed, callback) :
+
+ this.each(function(){
+ this.style.display = this.oldblock ? this.oldblock : "";
+ if ( jQuery.css(this,"display") == "none" )
+ this.style.display = "block";
+ });
+ },
+
+ /**
+ * Hides each of the set of matched elements if they are shown.
+ *
+ * @example $("p").hide()
+ * @before <p>Hello</p>
+ * @result [ <p style="display: none">Hello</p> ]
+ *
+ * @name hide
+ * @type jQuery
+ * @cat Effects
+ */
+
+ /**
+ * Hide all matched elements using a graceful animation and firing an
+ * optional callback after completion.
+ *
+ * The height, width, and opacity of each of the matched elements
+ * are changed dynamically according to the specified speed.
+ *
+ * @example $("p").hide("slow");
+ *
+ * @example $("p").hide("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name hide
+ * @type jQuery
+ * @param String|Number 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see show(String|Number,Function)
+ */
+ hide: function(speed,callback){
+ return speed ?
+ this.animate({
+ height: "hide", width: "hide", opacity: "hide"
+ }, speed, callback) :
+
+ this.each(function(){
+ this.oldblock = this.oldblock || jQuery.css(this,"display");
+ if ( this.oldblock == "none" )
+ this.oldblock = "block";
+ this.style.display = "none";
+ });
+ },
+
+ // Save the old toggle function
+ _toggle: jQuery.fn.toggle,
+
+ /**
+ * Toggles each of the set of matched elements. If they are shown,
+ * toggle makes them hidden. If they are hidden, toggle
+ * makes them shown.
+ *
+ * @example $("p").toggle()
+ * @before <p>Hello</p><p style="display: none">Hello Again</p>
+ * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
+ *
+ * @name toggle
+ * @type jQuery
+ * @cat Effects
+ */
+ toggle: function( fn, fn2 ){
+ return fn ?
+ this._toggle( fn, fn2 ) :
+ this.each(function(){
+ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]
+ .apply( jQuery(this), arguments );
+ });
+ },
+
+ /**
+ * Reveal all matched elements by adjusting their height and firing an
+ * optional callback after completion.
+ *
+ * Only the height is adjusted for this animation, causing all matched
+ * elements to be revealed in a "sliding" manner.
+ *
+ * @example $("p").slideDown("slow");
+ *
+ * @example $("p").slideDown("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name slideDown
+ * @type jQuery
+ * @param String|Number speed (optional) 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see slideUp(String|Number,Function)
+ * @see slideToggle(String|Number,Function)
+ */
+ slideDown: function(speed,callback){
+ return this.animate({height: "show"}, speed, callback);
+ },
+
+ /**
+ * Hide all matched elements by adjusting their height and firing an
+ * optional callback after completion.
+ *
+ * Only the height is adjusted for this animation, causing all matched
+ * elements to be hidden in a "sliding" manner.
+ *
+ * @example $("p").slideUp("slow");
+ *
+ * @example $("p").slideUp("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name slideUp
+ * @type jQuery
+ * @param String|Number speed (optional) 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see slideDown(String|Number,Function)
+ * @see slideToggle(String|Number,Function)
+ */
+ slideUp: function(speed,callback){
+ return this.animate({height: "hide"}, speed, callback);
+ },
+
+ /**
+ * Toggle the visibility of all matched elements by adjusting their height and firing an
+ * optional callback after completion.
+ *
+ * Only the height is adjusted for this animation, causing all matched
+ * elements to be hidden in a "sliding" manner.
+ *
+ * @example $("p").slideToggle("slow");
+ *
+ * @example $("p").slideToggle("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name slideToggle
+ * @type jQuery
+ * @param String|Number speed (optional) 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see slideDown(String|Number,Function)
+ * @see slideUp(String|Number,Function)
+ */
+ slideToggle: function(speed, callback){
+ return this.each(function(){
+ var state = jQuery(this).is(":hidden") ? "show" : "hide";
+ jQuery(this).animate({height: state}, speed, callback);
+ });
+ },
+
+ /**
+ * Fade in all matched elements by adjusting their opacity and firing an
+ * optional callback after completion.
+ *
+ * Only the opacity is adjusted for this animation, meaning that
+ * all of the matched elements should already have some form of height
+ * and width associated with them.
+ *
+ * @example $("p").fadeIn("slow");
+ *
+ * @example $("p").fadeIn("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name fadeIn
+ * @type jQuery
+ * @param String|Number speed (optional) 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see fadeOut(String|Number,Function)
+ * @see fadeTo(String|Number,Number,Function)
+ */
+ fadeIn: function(speed, callback){
+ return this.animate({opacity: "show"}, speed, callback);
+ },
+
+ /**
+ * Fade out all matched elements by adjusting their opacity and firing an
+ * optional callback after completion.
+ *
+ * Only the opacity is adjusted for this animation, meaning that
+ * all of the matched elements should already have some form of height
+ * and width associated with them.
+ *
+ * @example $("p").fadeOut("slow");
+ *
+ * @example $("p").fadeOut("slow",function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name fadeOut
+ * @type jQuery
+ * @param String|Number speed (optional) 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 (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see fadeIn(String|Number,Function)
+ * @see fadeTo(String|Number,Number,Function)
+ */
+ fadeOut: function(speed, callback){
+ return this.animate({opacity: "hide"}, speed, callback);
+ },
+
+ /**
+ * Fade the opacity of all matched elements to a specified opacity and firing an
+ * optional callback after completion.
+ *
+ * Only the opacity is adjusted for this animation, meaning that
+ * all of the matched elements should already have some form of height
+ * and width associated with them.
+ *
+ * @example $("p").fadeTo("slow", 0.5);
+ *
+ * @example $("p").fadeTo("slow", 0.5, function(){
+ * alert("Animation Done.");
+ * });
+ *
+ * @name fadeTo
+ * @type jQuery
+ * @param String|Number 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 Function callback (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ * @see fadeIn(String|Number,Function)
+ * @see fadeOut(String|Number,Function)
+ */
+ fadeTo: function(speed,to,callback){
+ return this.animate({opacity: to}, speed, callback);
+ },
+
+ /**
+ * A function for making your own, custom, animations. The key aspect of
+ * 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
+ * that will also be animated (for example: "height", "top", or "opacity").
+ *
+ * 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
+ * property will be transitioned from its current state to that new number.
+ * Oterwise if the string "hide", "show", or "toggle" is provided, a default
+ * animation will be constructed for that property.
+ *
+ * @example $("p").animate({
+ * height: 'toggle', opacity: 'toggle'
+ * }, "slow");
+ *
+ * @example $("p").animate({
+ * left: 50, opacity: 'show'
* }, 500);
*
- * @example $("p").animate({\r
- * opacity: 'show'\r
+ * @example $("p").animate({
+ * opacity: 'show'
* }, "slow", "easein");
- * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery).\r
- *\r
- * @name animate\r
- * @type jQuery\r
- * @param Hash params A set of style attributes that you wish to animate, and to what end.\r
+ * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery).
+ *
+ * @name animate
+ * @type jQuery
+ * @param Hash params A set of style attributes that you wish to animate, and to what end.
* @param String|Number speed (optional) 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 String easing (optional) The name of the easing effect that you want to use (Plugin Required).\r
- * @param Function callback (optional) A function to be executed whenever the animation completes.\r
- * @cat Effects\r
- */\r
- animate: function( prop, speed, easing, callback ) {\r
- return this.queue(function(){\r
- \r
+ * @param String easing (optional) The name of the easing effect that you want to use (Plugin Required).
+ * @param Function callback (optional) A function to be executed whenever the animation completes.
+ * @cat Effects
+ */
+ animate: function( prop, speed, easing, callback ) {
+ return this.queue(function(){
+
this.curAnim = jQuery.extend({}, prop);
- var opt = jQuery.speed(speed, easing, callback);\r
- \r
- for ( var p in prop ) {\r
- var e = new jQuery.fx( this, opt, p );\r
- if ( prop[p].constructor == Number )\r
- e.custom( e.cur(), prop[p] );\r
- else\r
- e[ prop[p] ]( prop );\r
- }\r
- \r
- });\r
- },\r
- \r
- /**\r
- *\r
- * @private\r
- */\r
- queue: function(type,fn){\r
- if ( !fn ) {\r
- fn = type;\r
- type = "fx";\r
- }\r
- \r
- return this.each(function(){\r
- if ( !this.queue )\r
- this.queue = {};\r
- \r
- if ( !this.queue[type] )\r
- this.queue[type] = [];\r
- \r
- this.queue[type].push( fn );\r
- \r
- if ( this.queue[type].length == 1 )\r
- fn.apply(this);\r
- });\r
- }\r
-\r
-});\r
-\r
-jQuery.extend({\r
- \r
- speed: function(speed, easing, fn) {\r
+ var opt = jQuery.speed(speed, easing, callback);
+
+ for ( var p in prop ) {
+ var e = new jQuery.fx( this, opt, p );
+ if ( prop[p].constructor == Number )
+ e.custom( e.cur(), prop[p] );
+ else
+ e[ prop[p] ]( prop );
+ }
+
+ });
+ },
+
+ /**
+ *
+ * @private
+ */
+ 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 )
+ fn.apply(this);
+ });
+ }
+
+});
+
+jQuery.extend({
+
+ speed: function(speed, easing, fn) {
var opt = speed.constructor == Object ? speed : {
complete: fn || !fn && easing ||
speed.constructor == Function && speed,
duration: speed,
easing: fn && easing || easing && easing.constructor != Function && easing
};
-\r
+
opt.duration = (opt.duration.constructor == Number ?
opt.duration :
- { slow: 600, fast: 200 }[opt.duration]) || 400;\r
- \r
- // Queueing\r
- opt.oldComplete = opt.complete;\r
- opt.complete = function(){\r
- jQuery.dequeue(this, "fx");\r
- if ( opt.oldComplete && opt.oldComplete.constructor == Function )\r
- opt.oldComplete.apply( this );\r
- };\r
- \r
- return opt;\r
+ { slow: 600, fast: 200 }[opt.duration]) || 400;
+
+ // Queueing
+ opt.oldComplete = opt.complete;
+ opt.complete = function(){
+ jQuery.dequeue(this, "fx");
+ if ( opt.oldComplete && opt.oldComplete.constructor == Function )
+ opt.oldComplete.apply( this );
+ };
+
+ return opt;
+ },
+
+ easing: {},
+
+ 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 ) f.apply( elem );
+ }
},
+
+ /*
+ * 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
+ * people. You've been warned.
+ */
- easing: {},\r
- \r
- queue: {},\r
- \r
- dequeue: function(elem,type){\r
- type = type || "fx";\r
- \r
- if ( elem.queue && elem.queue[type] ) {\r
- // Remove self\r
- elem.queue[type].shift();\r
- \r
- // Get next function\r
- var f = elem.queue[type][0];\r
- \r
- if ( f ) f.apply( elem );\r
- }\r
- },\r
-\r
- /*\r
- * I originally wrote fx() as a clone of moo.fx and in the process\r
- * of making it small in size the code became illegible to sane\r
- * people. You've been warned.\r
- */\r
- \r
- fx: function( elem, options, prop ){\r
-\r
- var z = this;\r
-\r
- // The styles\r
- var y = elem.style;\r
- \r
- // Store display property\r
- var oldDisplay = jQuery.css(elem, 'display');\r
- // Set display property to block for animation\r
- y.display = "block";\r
- // Make sure that nothing sneaks out\r
- y.overflow = "hidden";\r
-\r
- // Simple function for setting a style value\r
- z.a = function(){\r
- if ( options.step )\r
- options.step.apply( elem, [ z.now ] );\r
-\r
- if ( prop == "opacity" )\r
- jQuery.attr(y, "opacity", z.now); // Let attr handle opacity\r
- else if ( parseInt(z.now) ) // My hate for IE will never die\r
- y[prop] = parseInt(z.now) + "px";\r
- };\r
-\r
- // Figure out the maximum number to run to\r
- z.max = function(){\r
- return parseFloat( jQuery.css(elem,prop) );\r
- };\r
-\r
- // Get the current size\r
- z.cur = function(){\r
- var r = parseFloat( jQuery.curCSS(elem, prop) );\r
- return r && r > -10000 ? r : z.max();\r
- };\r
-\r
- // Start an animation from one number to another\r
- z.custom = function(from,to){\r
- z.startTime = (new Date()).getTime();\r
- z.now = from;\r
- z.a();\r
-\r
- z.timer = setInterval(function(){\r
- z.step(from, to);\r
- }, 13);\r
- };\r
-\r
- // Simple 'show' function\r
- z.show = function(){\r
- if ( !elem.orig ) elem.orig = {};\r
-\r
- // Remember where we started, so that we can go back to it later\r
- elem.orig[prop] = this.cur();\r
-\r
- options.show = true;\r
-\r
- // Begin the animation\r
- z.custom(0, elem.orig[prop]);\r
-\r
- // Stupid IE, look what you made me do\r
- if ( prop != "opacity" )\r
- y[prop] = "1px";\r
- };\r
-\r
- // Simple 'hide' function\r
- z.hide = function(){\r
- if ( !elem.orig ) elem.orig = {};\r
-\r
- // Remember where we started, so that we can go back to it later\r
- elem.orig[prop] = this.cur();\r
-\r
- options.hide = true;\r
-\r
- // Begin the animation\r
- z.custom(elem.orig[prop], 0);\r
- };\r
- \r
- //Simple 'toggle' function\r
- z.toggle = function() {\r
- if ( !elem.orig ) elem.orig = {};\r
-\r
- // Remember where we started, so that we can go back to it later\r
- elem.orig[prop] = this.cur();\r
-\r
- if(oldDisplay == 'none') {\r
- options.show = true;\r
- \r
- // Stupid IE, look what you made me do\r
- if ( prop != "opacity" )\r
- y[prop] = "1px";\r
-\r
- // Begin the animation\r
- z.custom(0, elem.orig[prop]); \r
- } else {\r
- options.hide = true;\r
-\r
- // Begin the animation\r
- z.custom(elem.orig[prop], 0);\r
- } \r
- };\r
-\r
- // Each step of an animation\r
- z.step = function(firstNum, lastNum){\r
- var t = (new Date()).getTime();\r
-\r
- if (t > options.duration + z.startTime) {\r
- // Stop the timer\r
- clearInterval(z.timer);\r
- z.timer = null;\r
-\r
- z.now = lastNum;\r
- z.a();\r
-\r
- if (elem.curAnim) elem.curAnim[ prop ] = true;\r
-\r
- var done = true;\r
- for ( var i in elem.curAnim )\r
- if ( elem.curAnim[i] !== true )\r
- done = false;\r
-\r
- if ( done ) {\r
- // Reset the overflow\r
- y.overflow = '';\r
- \r
- // Reset the display\r
- y.display = oldDisplay;\r
- if (jQuery.css(elem, 'display') == 'none')\r
- y.display = 'block';\r
-\r
- // Hide the element if the "hide" operation was done\r
- if ( options.hide ) \r
- y.display = 'none';\r
-\r
- // Reset the properties, if the item has been hidden or shown\r
- if ( options.hide || options.show )\r
- for ( var p in elem.curAnim )\r
- if (p == "opacity")\r
- jQuery.attr(y, p, elem.orig[p]);\r
- else\r
- y[p] = '';\r
- }\r
-\r
- // If a callback was provided, execute it\r
- if ( done && options.complete && options.complete.constructor == Function )\r
- // Execute the complete function\r
- options.complete.apply( elem );\r
- } else {\r
- var n = t - this.startTime;\r
- // Figure out where in the animation we are and set the number\r
+ fx: function( elem, options, prop ){
+
+ var z = this;
+
+ // The styles
+ var y = elem.style;
+
+ // Store display property
+ var oldDisplay = jQuery.css(elem, 'display');
+ // Set display property to block for animation
+ y.display = "block";
+ // Make sure that nothing sneaks out
+ y.overflow = "hidden";
+
+ // Simple function for setting a style value
+ z.a = function(){
+ if ( options.step )
+ options.step.apply( elem, [ z.now ] );
+
+ if ( prop == "opacity" )
+ jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
+ else if ( parseInt(z.now) ) // My hate for IE will never die
+ y[prop] = parseInt(z.now) + "px";
+ };
+
+ // Figure out the maximum number to run to
+ z.max = function(){
+ return parseFloat( jQuery.css(elem,prop) );
+ };
+
+ // Get the current size
+ z.cur = function(){
+ var r = parseFloat( jQuery.curCSS(elem, prop) );
+ return r && r > -10000 ? r : z.max();
+ };
+
+ // 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(){
+ if ( !elem.orig ) elem.orig = {};
+
+ // Remember where we started, so that we can go back to it later
+ elem.orig[prop] = this.cur();
+
+ options.show = true;
+
+ // Begin the animation
+ z.custom(0, elem.orig[prop]);
+
+ // Stupid IE, look what you made me do
+ if ( prop != "opacity" )
+ y[prop] = "1px";
+ };
+
+ // Simple 'hide' function
+ z.hide = function(){
+ if ( !elem.orig ) elem.orig = {};
+
+ // Remember where we started, so that we can go back to it later
+ elem.orig[prop] = this.cur();
+
+ options.hide = true;
+
+ // Begin the animation
+ z.custom(elem.orig[prop], 0);
+ };
+
+ //Simple 'toggle' function
+ z.toggle = function() {
+ if ( !elem.orig ) elem.orig = {};
+
+ // Remember where we started, so that we can go back to it later
+ elem.orig[prop] = this.cur();
+
+ if(oldDisplay == 'none') {
+ options.show = true;
+
+ // Stupid IE, look what you made me do
+ if ( prop != "opacity" )
+ y[prop] = "1px";
+
+ // Begin the animation
+ z.custom(0, elem.orig[prop]);
+ } else {
+ options.hide = true;
+
+ // Begin the animation
+ z.custom(elem.orig[prop], 0);
+ }
+ };
+
+ // Each step of an animation
+ z.step = function(firstNum, lastNum){
+ var t = (new Date()).getTime();
+
+ if (t > options.duration + z.startTime) {
+ // Stop the timer
+ clearInterval(z.timer);
+ z.timer = null;
+
+ z.now = lastNum;
+ z.a();
+
+ if (elem.curAnim) elem.curAnim[ prop ] = true;
+
+ var done = true;
+ for ( var i in elem.curAnim )
+ if ( elem.curAnim[i] !== true )
+ done = false;
+
+ if ( done ) {
+ // Reset the overflow
+ y.overflow = '';
+
+ // Reset the display
+ y.display = oldDisplay;
+ if (jQuery.css(elem, 'display') == 'none')
+ y.display = 'block';
+
+ // Hide the element if the "hide" operation was done
+ if ( options.hide )
+ y.display = 'none';
+
+ // Reset the properties, if the item has been hidden or shown
+ if ( options.hide || options.show )
+ for ( var p in elem.curAnim )
+ if (p == "opacity")
+ jQuery.attr(y, p, elem.orig[p]);
+ else
+ y[p] = '';
+ }
+
+ // If a callback was provided, execute it
+ if ( done && options.complete && options.complete.constructor == Function )
+ // Execute the complete function
+ options.complete.apply( elem );
+ } else {
+ var n = t - this.startTime;
+ // Figure out where in the animation we are and set the number
var p = n / options.duration;
- \r
- // If the easing function exists, then use it \r
+
+ // If the easing function exists, then use it
z.now = options.easing && jQuery.easing[options.easing] ?
jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration) :
// else use default linear easing
- ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;\r
-\r
- // Perform the next step of the animation\r
- z.a();\r
- }\r
- };\r
- \r
- }\r
-});
\ No newline at end of file
+ ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
+
+ // Perform the next step of the animation
+ z.a();
+ }
+ };
+
+ }
+});
git.asbjorn.biz / jquery.git / commitdiff