Skip to content

Commit

Permalink
Followup #12018, fix a test fail converting to pixels. Close gh-874.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikesherov authored and dmethvin committed Jul 25, 2012
1 parent 569d064 commit da4d609
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/css.js
Expand Up @@ -290,7 +290,7 @@ if ( window.getComputedStyle ) {
// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right // 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 // 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 // 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; width = style.width;
minWidth = style.minWidth; minWidth = style.minWidth;
maxWidth = style.maxWidth; maxWidth = style.maxWidth;
Expand Down

0 comments on commit da4d609

Please sign in to comment.