]> source.dussan.org Git - jquery.git/commitdiff
Followup #12018, fix a test fail converting to pixels. Close gh-874.
authorMike Sherov <mike.sherov@gmail.com>
Wed, 25 Jul 2012 12:49:51 +0000 (08:49 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Wed, 25 Jul 2012 13:45:38 +0000 (09:45 -0400)
src/css.js

index 0b20b7c4c4849affcac71b0bf8fdaf924e588087..d8d5239dd5da46b5337a7eb6a503716fc5a22302 100644 (file)
@@ -290,7 +290,7 @@ if ( window.getComputedStyle ) {
                        // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
                        // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
                        // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-                       if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+                       if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
                                width = style.width;
                                minWidth = style.minWidth;
                                maxWidth = style.maxWidth;