diff options
author | Richard Gibson <richard.gibson@gmail.com> | 2013-05-13 20:37:42 -0400 |
---|---|---|
committer | Richard Gibson <richard.gibson@gmail.com> | 2013-05-13 20:37:42 -0400 |
commit | d80c6aca18240281f553a35d727c2891d4bc2b57 (patch) | |
tree | de7306aa2b27756769b55caabf0c78e94babc059 /src | |
parent | 3971c2ebb2e6729fe80bac4ee7b91bc02f26486f (diff) | |
download | jquery-d80c6aca18240281f553a35d727c2891d4bc2b57.tar.gz jquery-d80c6aca18240281f553a35d727c2891d4bc2b57.zip |
Ref 3971c2eb: Sync with 1.x-master
Diffstat (limited to 'src')
-rw-r--r-- | src/effects.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/effects.js b/src/effects.js index bb10b73f8..78f36827a 100644 --- a/src/effects.js +++ b/src/effects.js @@ -249,7 +249,7 @@ jQuery.Animation = jQuery.extend( Animation, { function defaultPrefilter( elem, props, opts ) { /* jshint validthis: true */ - var index, prop, value, toggle, tween, hooks, oldfire, + var prop, value, toggle, tween, hooks, oldfire, anim = this, orig = {}, style = elem.style, @@ -310,21 +310,21 @@ function defaultPrefilter( elem, props, opts ) { // show/hide pass - for ( index in props ) { - value = props[ index ]; + for ( prop in props ) { + value = props[ prop ]; if ( rfxtypes.exec( value ) ) { - delete props[ index ]; + delete props[ prop ]; 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 && dataShow[ index ] !== undefined ) { + if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) { hidden = true; } else { continue; } } - orig[ index ] = dataShow && dataShow[ index ] || jQuery.style( elem, index ); + orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop ); } } |