aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2009-01-02 23:32:10 +0000
committerJohn Resig <jeresig@gmail.com>2009-01-02 23:32:10 +0000
commitb2583a7526c0051f7c5f11a25e0cbaeb13930fc6 (patch)
tree669f25084d8324eafbd654c66abff81fcc768ca8 /src
parentb2552e6ea35a1e00675d70a615d3af83137965df (diff)
downloadjquery-b2583a7526c0051f7c5f11a25e0cbaeb13930fc6.tar.gz
jquery-b2583a7526c0051f7c5f11a25e0cbaeb13930fc6.zip
Fixed an issue that was introduced by [5743] (which didn't have a test case, either - that has been resolved). This fixed #3739.
Diffstat (limited to 'src')
-rw-r--r--src/fx.js13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/fx.js b/src/fx.js
index ae472efd1..626227dbb 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -288,12 +288,9 @@ jQuery.fx.prototype = {
this.options.show = true;
// Begin the animation
- this.custom(0, this.cur());
-
// Make sure that we start at a small width/height to avoid any
// flash of content
- if ( this.prop == "width" || this.prop == "height" )
- this.elem.style[this.prop] = "1px";
+ this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur());
// Start by showing the element
jQuery(this.elem).show();
@@ -338,7 +335,7 @@ jQuery.fx.prototype = {
// Hide the element if the "hide" operation was done
if ( this.options.hide )
- this.elem.style.display = "none";
+ jQuery(this.elem).hide();
// Reset the properties, if the item has been hidden or shown
if ( this.options.hide || this.options.show )
@@ -382,10 +379,10 @@ jQuery.extend( jQuery.fx, {
},
_default: function(fx){
- if( fx.prop in fx.elem )
- fx.elem[ fx.prop ] = fx.now;
- else if( fx.elem.style )
+ if ( fx.elem.style && fx.elem.style[ fx.prop ] != null )
fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+ else
+ fx.elem[ fx.prop ] = fx.now;
}
}
});