X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=a73ce3272d5b80a6afa3a99c70acc283aefe4e63;hb=19cd84cf3261ee412a2521df73dcf9d6cfba04a3;hp=724e21f6ae8260e632b481fe77e6d56c6ea01053;hpb=7f1eb1c14fdf9a5d149c907df9e331cbecfa9720;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 724e21f..a73ce32 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -19,47 +19,47 @@ function genFx( type, num ){
 
 jQuery.fn.extend({
 	show: function(speed,callback){
-		if ( speed ) {
+		if ( speed !== undefined ) {
 			return this.animate( genFx("show", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
 				var old = jQuery.data(this[i], "olddisplay");
-				
+
 				this[i].style.display = old || "";
-				
+
 				if ( jQuery.css(this[i], "display") === "none" ) {
-					var tagName = this[i].tagName, display;
-					
-					if ( elemdisplay[ tagName ] ) {
-						display = elemdisplay[ tagName ];
+					var nodeName = this[i].nodeName, display;
+
+					if ( elemdisplay[ nodeName ] ) {
+						display = elemdisplay[ nodeName ];
 					} else {
-						var elem = jQuery("<" + tagName + " />").appendTo("body");
-						
+						var elem = jQuery("<" + nodeName + " />").appendTo("body");
+
 						display = elem.css("display");
 						if ( display === "none" )
 							display = "block";
-						
+
 						elem.remove();
-						
-						elemdisplay[ tagName ] = display;
+
+						elemdisplay[ nodeName ] = display;
 					}
-					
+
 					jQuery.data(this[i], "olddisplay", display);
 				}
+			}
 
-				// Set the display of the elements in a second loop
-				// to avoid the constant reflow
-				for ( var i = 0, l = this.length; i < l; i++ ){
-					this[i].style.display = jQuery.data(this[i], "olddisplay");
-				}
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( var i = 0, l = this.length; i < l; i++ ){
+				this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
 			}
-			
+
 			return this;
 		}
 	},
 
 	hide: function(speed,callback){
-		if ( speed ) {
+		if ( speed !== undefined ) {
 			return this.animate( genFx("hide", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
@@ -95,19 +95,28 @@ jQuery.fn.extend({
 	},
 
 	fadeTo: function(speed,to,callback){
-		return this.animate({opacity: to}, speed, callback);
+		return this.filter(":hidden").css('opacity', 0).show().end()
+					.animate({opacity: to}, speed, callback);
 	},
 
 	animate: function( prop, speed, easing, callback ) {
 		var optall = jQuery.speed(speed, easing, callback);
 
 		return this[ optall.queue === false ? "each" : "queue" ](function(){
-		
+
 			var opt = jQuery.extend({}, optall), p,
 				hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
 				self = this;
-	
+
 			for ( p in prop ) {
+				var name = p.replace(rdashAlpha, fcamelCase);
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
 				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
 					return opt.complete.call(this);
 
@@ -131,7 +140,7 @@ jQuery.fn.extend({
 				if ( /toggle|show|hide/.test(val) )
 					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
 				else {
-					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+					var parts = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val),
 						start = e.cur(true) || 0;
 
 					if ( parts ) {
@@ -285,26 +294,14 @@ jQuery.fx.prototype = {
 
 		t.elem = this.elem;
 
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			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( timerId );
-					timerId = undefined;
-				}
-			}, 13);
-		}
+		if ( t() && jQuery.timers.push(t) && !timerId )
+			timerId = setInterval(jQuery.fx.tick, 13);
 	},
 
 	// Simple 'show' function
 	show: function(){
 		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
 		this.options.show = true;
 
 		// Begin the animation
@@ -319,7 +316,7 @@ jQuery.fx.prototype = {
 	// Simple 'hide' function
 	hide: function(){
 		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
 		this.options.hide = true;
 
 		// Begin the animation
@@ -360,8 +357,8 @@ jQuery.fx.prototype = {
 				// Reset the properties, if the item has been hidden or shown
 				if ( this.options.hide || this.options.show )
 					for ( var p in this.options.curAnim )
-						jQuery.attr(this.elem.style, p, this.options.orig[p]);
-					
+						jQuery.style(this.elem, p, this.options.orig[p]);
+
 				// Execute the complete function
 				this.options.complete.call( this.elem );
 			}
@@ -385,16 +382,34 @@ jQuery.fx.prototype = {
 };
 
 jQuery.extend( jQuery.fx, {
+
+	tick:function(){
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ )
+			if ( !timers[i]() )
+				timers.splice(i--, 1);
+
+		if ( !timers.length )
+			jQuery.fx.stop();
+	},
+		
+	stop:function(){
+		clearInterval( timerId );
+		timerId = null;
+	},
+	
 	speeds:{
 		slow: 600,
  		fast: 200,
  		// Default speed
  		_default: 400
 	},
+
 	step: {
 
 		opacity: function(fx){
-			jQuery.attr(fx.elem.style, "opacity", fx.now);
+			jQuery.style(fx.elem, "opacity", fx.now);
 		},
 
 		_default: function(fx){