Commit c5edf982 authored by Anton M's avatar Anton M

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

parent dba8c20b
...@@ -189,7 +189,7 @@ jQuery.fn.extend({ ...@@ -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 = { ...@@ -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;
......
...@@ -919,3 +919,13 @@ test("hide hidden elements, with animation (bug #7141)", function() { ...@@ -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();
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment