library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 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
Show Stats 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 ) { function defaultPrefilter( elem, props, opts ) {
/* jshint validthis: true */ /* jshint validthis: true */
var index, prop, value, toggle, tween, hooks, oldfire, var prop, value, toggle, tween, hooks, oldfire,
anim = this, anim = this,
orig = {}, orig = {},
style = elem.style, style = elem.style,
@ -310,21 +310,21 @@ function defaultPrefilter( elem, props, opts ) {
// show/hide pass // show/hide pass
for ( index in props ) { for ( prop in props ) {
value = props[ index ]; value = props[ prop ];
if ( rfxtypes.exec( value ) ) { if ( rfxtypes.exec( value ) ) {
delete props[ index ]; delete props[ prop ];
toggle = toggle || value === "toggle"; toggle = toggle || value === "toggle";
if ( value === ( hidden ? "hide" : "show" ) ) { 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 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; hidden = true;
} else { } else {
continue; continue;
} }
} }
orig[ index ] = dataShow && dataShow[ index ] || jQuery.style( elem, index ); orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
} }
} }

4
test/unit/effects.js vendored
View File

@ -1379,8 +1379,8 @@ test("line-height animates correctly (#13855)", function() {
animated = jQuery( animated = jQuery(
"<p style='line-height: 4;'>unitless</p>" + "<p style='line-height: 4;'>unitless</p>" +
"<p style='line-height: 50px;'>px</p>" + "<p style='line-height: 50px;'>px</p>" +
"<p style='line-height: 120%;'>percent</p>" + "<p style='line-height: 420%;'>percent</p>" +
"<p style='line-height: 1.5em;'>em</p>" "<p style='line-height: 2.5em;'>em</p>"
).appendTo("#qunit-fixture"), ).appendTo("#qunit-fixture"),
initialHeight = jQuery.map( animated, function( el ) { initialHeight = jQuery.map( animated, function( el ) {
return jQuery( el ).height(); return jQuery( el ).height();