diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2012-07-25 08:49:51 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2012-07-25 09:45:38 -0400 |
| commit | da4d60929778490094fbf1f9c6abd9ea7d0e0c99 (patch) | |
| tree | a35e8d66d3cddb352e9c70df10a0bfff623fcb4b /src/css.js | |
| parent | 569d064fc93459695cb6eb6fd09e5ba3fda62f03 (diff) | |
| download | jquery-da4d60929778490094fbf1f9c6abd9ea7d0e0c99.tar.gz jquery-da4d60929778490094fbf1f9c6abd9ea7d0e0c99.zip | |
Followup #12018, fix a test fail converting to pixels. Close gh-874.
Diffstat (limited to 'src/css.js')
| -rw-r--r-- | src/css.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/css.js b/src/css.js index 0b20b7c4c..d8d5239dd 100644 --- a/src/css.js +++ b/src/css.js @@ -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; |