CSS: Fix the pixelMarginRight support test in Android 2.3

This commit is contained in:
Michał Gołębiowski 2015-02-05 01:41:10 +01:00
parent 3747cc642a
commit cdfc2d092a
2 changed files with 8 additions and 7 deletions

View File

@ -25,12 +25,6 @@ function curCSS( elem, name, computed ) {
ret = jQuery.style( elem, name ); ret = jQuery.style( elem, name );
} }
// Support: Android 4.0-4.3
// A tribute to the "awesome hack by Dean Edwards"
// 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 ) ) { if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
// Remember the original values // Remember the original values

View File

@ -62,8 +62,15 @@ define([
return boxSizingReliableVal; return boxSizingReliableVal;
}, },
pixelMarginRight: function() { pixelMarginRight: function() {
// Support: Android 4.0-4.3
// A tribute to the "awesome hack by Dean Edwards"
// 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 ( pixelMarginRightVal == null ) { if ( pixelMarginRightVal == null ) {
div.style.cssText = "display:block;width:50%;margin-right:50%"; div.style.cssText = "display:block;width:50%;border:0;margin:0;padding:0;" +
"margin-right:50%";
documentElement.appendChild( container ); documentElement.appendChild( container );
pixelMarginRightVal = pixelMarginRightVal =
window.getComputedStyle( div, null ).marginRight === "4px"; window.getComputedStyle( div, null ).marginRight === "4px";