github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-08 08:45:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Followup #12018, fix a test fail converting to pixels. Close gh-874.

Browse Source
This commit is contained in:
Mike Sherov
2012-07-25 08:49:51 -04:00
committed by Dave Methvin
parent 569d064fc9
commit da4d609297
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/css.js
View 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;