Skip to content
Permalink
Browse files

Fix #13183: Wrong animation initial value calc. Ref gh-1136.

  • Loading branch information...
mikesherov authored and dmethvin committed Jan 16, 2013
1 parent 86278d4 commit 10cc33e27beb56e41bea1274bc3b51b1c59af9af
Showing with 27 additions and 10 deletions.
  1. +1 −1 src/css.js
  2. +2 −2 src/effects.js
  3. +24 −7 test/unit/effects.js
@@ -263,7 +263,7 @@ jQuery.extend({
}

// Return, converting to number if forced or a qualifier was provided and val looks numeric
if ( extra ) {
if ( extra === "" || extra ) {
num = parseFloat( val );
return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
}
@@ -418,11 +418,11 @@ Tween.propHooks = {
return tween.elem[ tween.prop ];
}

// passing a non empty string as a 3rd parameter to .css will automatically
// passing an empty string as a 3rd parameter to .css will automatically
// attempt a parseFloat and fallback to a string if the parse fails
// so, simple values such as "10px" are parsed to Float.
// complex values such as "rotate(1rad)" are returned as is.
result = jQuery.css( tween.elem, tween.prop, "auto" );
result = jQuery.css( tween.elem, tween.prop, "" );
// Empty strings, null, undefined and "auto" are converted to 0.
return !result || result === "auto" ? 0 : result;
},
@@ -257,14 +257,31 @@ test("animate native inline width/height", function() {
});
});

test("animate block width/height", function() {
expect(3);
test( "animate block width/height", function() {
expect( 3 );
stop();
jQuery("#foo").css({ display: "block", width: 20, height: 20 }).animate({ width: 42, height: 42 }, 100, function() {
equal( jQuery(this).css("display"), "block", "inline-block was not set on block element when animating width/height" );
equal( this.offsetWidth, 42, "width was animated" );
equal( this.offsetHeight, 42, "height was animated" );
start();

jQuery("<div>").appendTo("#qunit-fixture").css({
display: "block",
width: 20,
height: 20,
paddingLeft: 60
}).animate({
width: 42,
height: 42
}, {
duration: 100,
step: function() {
if ( jQuery( this ).width() > 42 ) {
ok( false, "width was incorrectly augmented during animation" );
}
},
complete: function() {
equal( jQuery( this ).css("display"), "block", "inline-block was not set on block element when animating width/height" );
equal( jQuery( this ).width(), 42, "width was animated" );
equal( jQuery( this ).height(), 42, "height was animated" );
start();
}
});
});

0 comments on commit 10cc33e

Please sign in to comment.
You can’t perform that action at this time.