diff options
author | Renato Oliveira dos Santos <ros3@cin.ufpe.br> | 2013-03-17 03:40:18 -0300 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2013-04-16 23:07:39 -0400 |
commit | ea5c22ec12e6a548b1ec2d7b0dcd9f71bea8d5dd (patch) | |
tree | 2bdcad9d896f0222c6a3fdbc52c834f63bc2fcb8 /src | |
parent | 2c7b1b8502ba85320678499c8499b647c1ea82e2 (diff) | |
download | jquery-ea5c22ec12e6a548b1ec2d7b0dcd9f71bea8d5dd.tar.gz jquery-ea5c22ec12e6a548b1ec2d7b0dcd9f71bea8d5dd.zip |
Fix #13483. Let slideDown() work after stop(). Close gh-1205.
Diffstat (limited to 'src')
-rw-r--r-- | src/effects.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/effects.js b/src/effects.js index 7f54dd56e..a1ba37707 100644 --- a/src/effects.js +++ b/src/effects.js @@ -304,21 +304,29 @@ function defaultPrefilter( elem, props, opts ) { // show/hide pass + dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} ); for ( index in props ) { value = props[ index ]; if ( rfxtypes.exec( value ) ) { delete props[ index ]; toggle = toggle || value === "toggle"; if ( value === ( hidden ? "hide" : "show" ) ) { + + // If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden + if( value === "show" && dataShow[ index ] !== undefined ) { + hidden = true; + } else { continue; } + } handled.push( index ); } } length = handled.length; - if ( length ) { + if ( !length ) { dataShow = data_priv.get( elem, "fxshow" ) || data_priv.access( elem, "fxshow", {} ); + } else { if ( "hidden" in dataShow ) { hidden = dataShow.hidden; } |