diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2017-09-18 11:59:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 11:59:50 -0400 |
| commit | 94ddf620224d6555aaa7eaac20c583b15c6f50d8 (patch) | |
| tree | c2d8281d7935a1da7c07ceef90bb7a0007d80308 /src/css/curCSS.js | |
| parent | 8ea78caa8297e9fa5bf3d13b3d14609a24679f76 (diff) | |
| download | jquery-94ddf620224d6555aaa7eaac20c583b15c6f50d8.tar.gz jquery-94ddf620224d6555aaa7eaac20c583b15c6f50d8.zip | |
CSS: Detect more WebKit styles erroneously reported as percentages
Ref 692f9d4db30c9c6c4f6bc76005cf153586202fa6
Fixes gh-3777
Closes gh-3778
Diffstat (limited to 'src/css/curCSS.js')
| -rw-r--r-- | src/css/curCSS.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/css/curCSS.js b/src/css/curCSS.js index 01ccad3ae..aa1414d26 100644 --- a/src/css/curCSS.js +++ b/src/css/curCSS.js @@ -1,11 +1,11 @@ define( [ "../core", + "./var/rboxStyle", "./var/rnumnonpx", - "./var/rmargin", "./var/getStyles", "./support", "../selector" // Get jQuery.contains -], function( jQuery, rnumnonpx, rmargin, getStyles, support ) { +], function( jQuery, rboxStyle, rnumnonpx, getStyles, support ) { "use strict"; @@ -35,7 +35,7 @@ function curCSS( elem, name, computed ) { // but width seems to be reliably pixels. // This is against the CSSOM draft spec: // https://drafts.csswg.org/cssom/#resolved-values - if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) { + if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) { // Remember the original values width = style.width; |