X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=0b5f8d8e1f496fed83b438537b5881a22782d4c7;hb=d7d908b05a442745c1a90728805b74db0a7921cf;hp=c949bdc6a956cb33c35d7a9f08bc9cc9b94a781a;hpb=72cf42bcbd4f7dc351d313c65d8bce113981d159;p=jquery.git diff --git a/src/fx.js b/src/fx.js index c949bdc..0b5f8d8 100644 --- a/src/fx.js +++ b/src/fx.js @@ -95,7 +95,8 @@ 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 ) { @@ -304,7 +305,7 @@ jQuery.fx.prototype = { // 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 +320,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,7 +361,7 @@ 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 ); @@ -394,7 +395,7 @@ jQuery.extend( jQuery.fx, { step: { opacity: function(fx){ - jQuery.attr(fx.elem.style, "opacity", fx.now); + jQuery.style(fx.elem, "opacity", fx.now); }, _default: function(fx){