github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ref 3971c2eb: Sync with 1.x-master

Browse Source
This commit is contained in:
Richard Gibson
2013-05-13 20:37:42 -04:00
parent 3971c2ebb2
commit d80c6aca18
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/effects.js vendored
View File

@@ -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 );
}
}