Fix breaking test in Chrome.
authorAnton M <obhvsbypqghgc@gmail.com>
Sun, 13 Feb 2011 23:37:07 +0000 (00:37 +0100)
committerAnton M <obhvsbypqghgc@gmail.com>
Sun, 13 Feb 2011 23:37:07 +0000 (00:37 +0100)
src/effects.js
test/unit/effects.js

index 0b08bc2..fd832ce 100644 (file)
@@ -189,7 +189,7 @@ jQuery.fn.extend({
 
                                        if ( parts ) {
                                                var end = parseFloat( parts[2] ),
-                                                       unit = parts[3] || jQuery.cssNumber[ name ] ? "" : "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 || jQuery.cssNumber[ this.prop ] ? "" : "px";
+               this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
                this.now = this.start;
                this.pos = this.state = 0;
 
index 7fb1c7d..a07c076 100644 (file)
@@ -922,7 +922,7 @@ 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" );
+       var div = jQuery( "<div style='z-index: 0; position: absolute;'></div>" ).appendTo( "#main" );
        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" );