Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CSS: Detect more WebKit styles erroneously reported as percentages #25

Merged
merged 1 commit into from Sep 19, 2017
Merged

CSS: Detect more WebKit styles erroneously reported as percentages #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/css.js
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@ define( [
"./core",
"./var/pnum",
"./core/access",
"./css/var/rmargin",
"./var/document",
"./var/rcssNum",
"./css/var/rnumnonpx",
Expand All @@ -17,7 +16,7 @@ define( [
"./core/init",
"./core/ready",
"./selector" // contains
], function( jQuery, pnum, access, rmargin, document, rcssNum, rnumnonpx, cssExpand,
], function( jQuery, pnum, access, document, rcssNum, rnumnonpx, cssExpand,
getStyles, swap, curCSS, adjustCSS, addGetHookIf, support ) {

"use strict";
Expand Down Expand Up @@ -447,7 +446,7 @@ jQuery.each( {
}
};

if ( !rmargin.test( prefix ) ) {
if ( prefix !== "margin" ) {
jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
}
} );
Expand Down
6 changes: 3 additions & 3 deletions src/css/curCSS.js
View file
Open in desktop
@@ -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";

Expand Down Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/css/support.js
View file
Open in desktop
Expand Up @@ -32,10 +32,10 @@ define( [
// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
reliableMarginLeftVal = divStyle.marginLeft === "12px";

// Support: Android 4.0 - 4.3 only
// Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3
// Some styles come back with percentage values, even though they shouldn't
div.style.marginRight = "60%";
pixelMarginRightVal = divStyle.marginRight === "36px";
div.style.right = "60%";
pixelBoxStylesVal = divStyle.right === "36px";

// Support: IE 9 - 11 only
// Detect misreporting of content dimensions for box-sizing:border-box elements
Expand All @@ -53,7 +53,7 @@ define( [
div = null;
}

var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelMarginRightVal,
var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
reliableMarginLeftVal,
container = document.createElement( "div" ),
div = document.createElement( "div" );
Expand All @@ -74,13 +74,13 @@ define( [
computeStyleTests();
return boxSizingReliableVal;
},
pixelPosition: function() {
pixelBoxStyles: function() {
computeStyleTests();
return pixelPositionVal;
return pixelBoxStylesVal;
},
pixelMarginRight: function() {
pixelPosition: function() {
computeStyleTests();
return pixelMarginRightVal;
return pixelPositionVal;
},
reliableMarginLeft: function() {
computeStyleTests();
Expand Down
7 changes: 7 additions & 0 deletions src/css/var/rboxStyle.js
View file
Open in desktop
@@ -0,0 +1,7 @@
define( [
"./cssExpand"
], function( cssExpand ) {
"use strict";

return new RegExp( cssExpand.join( "|" ), "i" );
} );
5 changes: 0 additions & 5 deletions src/css/var/rmargin.js
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions test/unit/support.js
View file
Open in desktop
Expand Up @@ -70,7 +70,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": true,
"pixelPosition": true,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -88,7 +88,7 @@ testIframe(
"focusin": true,
"noCloneChecked": false,
"optSelected": false,
"pixelMarginRight": true,
"pixelBoxStyles": true,
"pixelPosition": true,
"radioValue": false,
"reliableMarginLeft": true,
Expand All @@ -106,7 +106,7 @@ testIframe(
"focusin": true,
"noCloneChecked": false,
"optSelected": false,
"pixelMarginRight": true,
"pixelBoxStyles": true,
"pixelPosition": true,
"radioValue": false,
"reliableMarginLeft": true,
Expand All @@ -127,7 +127,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": true,
"pixelPosition": true,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -145,7 +145,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": false,
"pixelPosition": false,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -163,7 +163,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": true,
"pixelPosition": true,
"radioValue": true,
"reliableMarginLeft": false,
Expand All @@ -181,7 +181,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": false,
"pixelPosition": false,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -199,7 +199,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": false,
"pixelPosition": false,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -217,7 +217,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": true,
"pixelBoxStyles": false,
"pixelPosition": false,
"radioValue": true,
"reliableMarginLeft": true,
Expand All @@ -235,7 +235,7 @@ testIframe(
"focusin": false,
"noCloneChecked": true,
"optSelected": true,
"pixelMarginRight": false,
"pixelBoxStyles": false,
"pixelPosition": false,
"radioValue": true,
"reliableMarginLeft": false,
Expand Down