Skip to content
Permalink
Browse files

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

  • Loading branch information...
mikesherov authored and dmethvin committed Jul 25, 2012
1 parent 569d064 commit da4d60929778490094fbf1f9c6abd9ea7d0e0c99
Showing with 1 addition and 1 deletion.
  1. +1 −1 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;

0 comments on commit da4d609

Please sign in to comment.
You can’t perform that action at this time.