diff options
Diffstat (limited to 'js/vendor/jquery/src/css/curCSS.js')
| -rw-r--r-- | js/vendor/jquery/src/css/curCSS.js | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/js/vendor/jquery/src/css/curCSS.js b/js/vendor/jquery/src/css/curCSS.js index 90e508cb8..be643ab54 100644 --- a/js/vendor/jquery/src/css/curCSS.js +++ b/js/vendor/jquery/src/css/curCSS.js @@ -1,10 +1,11 @@ -define([ +define( [ "../core", "./var/rnumnonpx", "./var/rmargin", "./var/getStyles", - "../selector" // contains -], function( jQuery, rnumnonpx, rmargin, getStyles ) { + "./support", + "../selector" // Get jQuery.contains +], function( jQuery, rnumnonpx, rmargin, getStyles, support ) { function curCSS( elem, name, computed ) { var width, minWidth, maxWidth, ret, @@ -16,19 +17,17 @@ function curCSS( elem, name, computed ) { // getPropertyValue is only needed for .css('filter') (#12537) if ( computed ) { ret = computed.getPropertyValue( name ) || computed[ name ]; - } - - if ( computed ) { if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { ret = jQuery.style( elem, name ); } - // Support: iOS < 6 // A tribute to the "awesome hack by Dean Edwards" - // iOS < 6 (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 ) && rmargin.test( name ) ) { + // Android Browser returns percentage for some values, + // but width seems to be reliably pixels. + // This is against the CSSOM draft spec: + // http://dev.w3.org/csswg/cssom/#resolved-values + if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) { // Remember the original values width = style.width; @@ -47,11 +46,12 @@ function curCSS( elem, name, computed ) { } return ret !== undefined ? - // Support: IE + + // Support: IE9-11+ // IE returns zIndex value as an integer. ret + "" : ret; } return curCSS; -}); +} ); |