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

Add back unit in the width/height step function. Fixes #10669.

Browse Source
This commit is contained in:
timmywil
2011-11-07 10:46:46 -05:00
parent a7e911b7fe
commit 1e677f30f6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects.js vendored
View File

@@ -620,7 +620,7 @@ jQuery.extend( jQuery.fx, {
// Do not set anything below 0
jQuery.each([ "width", "height" ], function( i, prop ) {
jQuery.fx.step[ prop ] = function( fx ) {
jQuery.style( fx.elem, prop, Math.max(0, fx.now) );
jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
};
});

15
test/unit/effects.js vendored
View File

@@ -324,6 +324,21 @@ test("animate table-cell width/height", function() {
});
});
test("animate percentage(%) on width/height", function() {
expect( 2 );
var $div = jQuery("<div style='position:absolute;top:-999px;left:-999px;width:60px;height:60px;'><div style='width:50%;height:50%;'></div></div>")
.appendTo("#qunit-fixture").children("div");
stop();
$div.animate({ width: "25%", height: "25%" }, 13, function() {
var $this = jQuery(this);
equal( $this.width(), 15, "Width was animated to 15px rather than 25px");
equal( $this.height(), 15, "Height was animated to 15px rather than 25px");
start();
});
});
test("animate resets overflow-x and overflow-y when finished", function() {
expect(2);
stop();