Skip to content

Commit

Permalink
Refactor code in effects to use data_priv. Re- Close gh-1244.
Browse files Browse the repository at this point in the history
  • Loading branch information
ros3cin authored and dmethvin committed Apr 17, 2013
1 parent 039371c commit 5179fa0
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/effects.js
Expand Up @@ -304,7 +304,7 @@ function defaultPrefilter( elem, props, opts ) {


// show/hide pass
dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
dataShow = data_priv.get( elem, "fxshow" );
for ( index in props ) {
value = props[ index ];
if ( rfxtypes.exec( value ) ) {
Expand All @@ -313,20 +313,19 @@ function defaultPrefilter( elem, props, opts ) {
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 ) {
if( value === "show" && dataShow !== undefined && dataShow[ index ] !== undefined ) {
hidden = true;
} else {
continue;
}
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;
}
Expand Down

0 comments on commit 5179fa0

Please sign in to comment.