deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't add "px" to unit-less properties when animating them. Fixes #4966.

Browse source
This commit is contained in:
Anton M 2011-02-13 23:03:46 +01:00
parent dba8c20b4b
commit c5edf982d5
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/effects.js vendored
View file

@ -189,7 +189,7 @@ jQuery.fn.extend({
if ( parts ) { if ( parts ) {
var end = parseFloat( parts[2] ), var end = parseFloat( parts[2] ),
unit = parts[3] || "px"; unit = parts[3] || jQuery.cssNumber[ name ] ? "" : "px";
// We need to compute starting value // We need to compute starting value
if ( unit !== "px" ) { if ( unit !== "px" ) {
@ -348,7 +348,7 @@ jQuery.fx.prototype = {
this.startTime = jQuery.now(); this.startTime = jQuery.now();
this.start = from; this.start = from;
this.end = to; this.end = to;
this.unit = unit || this.unit || "px"; this.unit = unit || this.unit || jQuery.cssNumber[ this.prop ] ? "" : "px";
this.now = this.start; this.now = this.start;
this.pos = this.state = 0; this.pos = this.state = 0;

10
test/unit/effects.js vendored
View file

@ -919,3 +919,13 @@ test("hide hidden elements, with animation (bug #7141)", function() {
}); });
}); });
}); });
test("animate unit-less properties (#4966)", 2, function() {
stop();
var div = jQuery( "<div style='z-index: 0'></div>" ).appendTo( "body" );
equal( div.css( "z-index" ), "0", "z-index is 0" );
div.animate({ zIndex: 2 }, function() {
equal( div.css( "z-index" ), "2", "z-index is 2" );
start();
});
});