mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Don't add "px" to unit-less properties when animating them. Fixes #4966.
This commit is contained in:
parent
dba8c20b4b
commit
c5edf982d5
4
src/effects.js
vendored
4
src/effects.js
vendored
@ -189,7 +189,7 @@ jQuery.fn.extend({
|
||||
|
||||
if ( parts ) {
|
||||
var end = parseFloat( parts[2] ),
|
||||
unit = parts[3] || "px";
|
||||
unit = parts[3] || jQuery.cssNumber[ name ] ? "" : "px";
|
||||
|
||||
// We need to compute starting value
|
||||
if ( unit !== "px" ) {
|
||||
@ -348,7 +348,7 @@ jQuery.fx.prototype = {
|
||||
this.startTime = jQuery.now();
|
||||
this.start = from;
|
||||
this.end = to;
|
||||
this.unit = unit || this.unit || "px";
|
||||
this.unit = unit || this.unit || jQuery.cssNumber[ this.prop ] ? "" : "px";
|
||||
this.now = this.start;
|
||||
this.pos = this.state = 0;
|
||||
|
||||
|
10
test/unit/effects.js
vendored
10
test/unit/effects.js
vendored
@ -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();
|
||||
});
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user