Skip to content

Commit 3527a38

Browse files
mgolmgol
authored
Core: Remove IE-specific support tests, rely on document.documentMode
Also, update some tests to IE-sniff when deciding whether to skip a test. Fixes gh-4386 Closes gh-4387
1 parent ccbd6b9 commit 3527a38

27 files changed

+293
-465
lines changed

‎src/ajax.js

+6
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,12 @@ jQuery.extend( {
458458
if ( !responseHeaders ) {
459459
responseHeaders = {};
460460
while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
461+
462+
// Support: IE 11+
463+
// `getResponseHeader( key )` in IE doesn't combine all header
464+
// values for the provided key into a single result with values
465+
// joined by commas as other browsers do. Instead, it returns
466+
// them on separate lines.
461467
responseHeaders[ match[ 1 ].toLowerCase() + " " ] =
462468
( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] )
463469
.concat( match[ 2 ] );

‎src/attributes/attr.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ define( [
22
"../core",
33
"../core/access",
44
"../core/nodeName",
5-
"./support",
65
"../var/rnothtmlwhite",
6+
"../var/isIE",
77
"../selector"
8-
], function( jQuery, access, nodeName, support, rnothtmlwhite ) {
8+
], function( jQuery, access, nodeName, rnothtmlwhite, isIE ) {
99

1010
"use strict";
1111

@@ -74,8 +74,10 @@ jQuery.extend( {
7474
attrHooks: {
7575
type: {
7676
set: function( elem, value ) {
77-
if ( !support.radioValue && value === "radio" &&
78-
nodeName( elem, "input" ) ) {
77+
78+
// Support: IE <=11+
79+
// An input loses its value after becoming a radio
80+
if ( isIE && value === "radio" && nodeName( elem, "input" ) ) {
7981
var val = elem.value;
8082
elem.setAttribute( "type", value );
8183
if ( val ) {

‎src/attributes/prop.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
define( [
22
"../core",
33
"../core/access",
4-
"./support",
4+
"../var/isIE",
55
"../selector"
6-
], function( jQuery, access, support ) {
6+
], function( jQuery, access, isIE ) {
77

88
"use strict";
99

@@ -90,14 +90,11 @@ jQuery.extend( {
9090
} );
9191

9292
// Support: IE <=11+
93-
// Accessing the selectedIndex property
94-
// forces the browser to respect setting selected
95-
// on the option
96-
// The getter ensures a default option is selected
97-
// when in an optgroup
98-
// eslint rule "no-unused-expressions" is disabled for this code
99-
// since it considers such accessions noop
100-
if ( !support.optSelected ) {
93+
// Accessing the selectedIndex property forces the browser to respect
94+
// setting selected on the option. The getter ensures a default option
95+
// is selected when in an optgroup. ESLint rule "no-unused-expressions"
96+
// is disabled for this code since it considers such accessions noop.
97+
if ( isIE ) {
10198
jQuery.propHooks.selected = {
10299
get: function( elem ) {
103100

‎src/attributes/support.js

-29
This file was deleted.

‎src/css.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ define( [
22
"./core",
33
"./core/access",
44
"./var/rcssNum",
5+
"./var/isIE",
56
"./css/var/rnumnonpx",
67
"./css/var/cssExpand",
78
"./css/isAutoPx",
@@ -10,14 +11,13 @@ define( [
1011
"./css/var/swap",
1112
"./css/curCSS",
1213
"./css/adjustCSS",
13-
"./css/support",
1414
"./css/finalPropName",
1515

1616
"./core/init",
1717
"./core/ready",
1818
"./selector" // contains
19-
], function( jQuery, access, rcssNum, rnumnonpx, cssExpand, isAutoPx, cssCamelCase,
20-
getStyles, swap, curCSS, adjustCSS, support, finalPropName ) {
19+
], function( jQuery, access, rcssNum, isIE, rnumnonpx, cssExpand, isAutoPx,
20+
cssCamelCase, getStyles, swap, curCSS, adjustCSS, finalPropName ) {
2121

2222
"use strict";
2323

@@ -121,7 +121,7 @@ function getWidthOrHeight( elem, dimension, extra ) {
121121

122122
// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322).
123123
// Fake content-box until we know it's needed to know the true value.
124-
boxSizingNeeded = !support.boxSizingReliable() || extra,
124+
boxSizingNeeded = isIE || extra,
125125
isBorderBox = boxSizingNeeded &&
126126
jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
127127
valueIsBorderBox = isBorderBox,
@@ -140,11 +140,12 @@ function getWidthOrHeight( elem, dimension, extra ) {
140140

141141
// Fall back to offsetWidth/offsetHeight when value is "auto"
142142
// This happens for inline elements with no explicit setting (gh-3571)
143+
//
143144
// Support: IE 9 - 11+
144145
// Also use offsetWidth/offsetHeight for when box sizing is unreliable
145146
// We use getClientRects() to check for hidden/disconnected.
146147
// In those cases, the computed value can be trusted to be border-box
147-
if ( ( !support.boxSizingReliable() && isBorderBox || val === "auto" ) &&
148+
if ( ( isIE && isBorderBox || val === "auto" ) &&
148149
elem.getClientRects().length ) {
149150

150151
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
@@ -239,8 +240,9 @@ jQuery.extend( {
239240
value += ret && ret[ 3 ] || ( isAutoPx( origName ) ? "px" : "" );
240241
}
241242

242-
// background-* props affect original clone's values
243-
if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
243+
// Support: IE <=9 - 11+
244+
// background-* props of a cloned element affect the source element (#8908)
245+
if ( isIE && value === "" && name.indexOf( "background" ) === 0 ) {
244246
style[ name ] = "inherit";
245247
}
246248

‎src/css/support.js

-60
This file was deleted.

‎src/manipulation.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ define( [
22
"./core",
33
"./core/isAttached",
44
"./var/concat",
5+
"./var/isIE",
56
"./var/push",
67
"./var/rcheckableType",
78
"./core/access",
@@ -11,7 +12,6 @@ define( [
1112
"./manipulation/getAll",
1213
"./manipulation/setGlobalEval",
1314
"./manipulation/buildFragment",
14-
"./manipulation/support",
1515

1616
"./data/var/dataPriv",
1717
"./data/var/dataUser",
@@ -23,9 +23,9 @@ define( [
2323
"./traversing",
2424
"./selector",
2525
"./event"
26-
], function( jQuery, isAttached, concat, push, rcheckableType,
27-
access, rtagName, rscriptType,
28-
wrapMap, getAll, setGlobalEval, buildFragment, support,
26+
], function( jQuery, isAttached, concat, isIE, push,
27+
rcheckableType, access, rtagName, rscriptType,
28+
wrapMap, getAll, setGlobalEval, buildFragment,
2929
dataPriv, dataUser, acceptData, DOMEval, nodeName ) {
3030

3131
"use strict";
@@ -222,7 +222,7 @@ jQuery.extend( {
222222
inPage = isAttached( elem );
223223

224224
// Fix IE cloning issues
225-
if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
225+
if ( isIE && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
226226
!jQuery.isXMLDoc( elem ) ) {
227227

228228
// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
@@ -233,7 +233,7 @@ jQuery.extend( {
233233

234234
// Support: IE <=11+
235235
// IE fails to set the defaultValue to the correct value when
236-
// cloning other types of input fields
236+
// cloning textareas.
237237
if ( destElements[ i ].nodeName.toLowerCase() === "textarea" ) {
238238
destElements[ i ].defaultValue = srcElements[ i ].defaultValue;
239239
}

‎src/manipulation/support.js

-28
This file was deleted.

‎src/var/isIE.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
define( [
2+
"./document"
3+
], function( document ) {
4+
"use strict";
5+
6+
return document.documentMode;
7+
} );

‎test/data/inner_nomodule.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
QUnit.assert.ok( !QUnit.moduleTypeSupported, "evaluated: inner nomodule script with src" );
1+
QUnit.assert.ok( QUnit.isIE, "evaluated: inner nomodule script with src" );

‎test/data/nomodule.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
QUnit.assert.ok( !QUnit.moduleTypeSupported, "evaluated: nomodule script with src" );
1+
QUnit.assert.ok( QUnit.isIE, "evaluated: nomodule script with src" );

‎test/data/testinit-jsdom.js

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// jsdom implements a throwing `window.scrollTo`.
55
QUnit.config.scrolltop = false;
66

7+
QUnit.isIE = false;
8+
QUnit.testUnlessIE = QUnit.test;
9+
710
const FILEPATH = "/test/data/testinit-jsdom.js";
811
const activeScript = document.currentScript;
912
const parentUrl = activeScript && activeScript.src ?

‎test/data/testinit.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,11 @@ if ( !window.__karma__ ) {
256256
QUnit.isSwarm = ( QUnit.urlParams.swarmURL + "" ).indexOf( "http" ) === 0;
257257
QUnit.basicTests = ( QUnit.urlParams.module + "" ) === "basic";
258258

259-
// Async test for module script type support
260-
function moduleTypeSupported() {
261-
var script = document.createElement( "script" );
262-
script.type = "module";
263-
script.text = "QUnit.moduleTypeSupported = true";
264-
document.head.appendChild( script ).parentNode.removeChild( script );
265-
}
266-
moduleTypeSupported();
259+
// Support: IE 11+
260+
// A variable to make it easier to skip specific tests in IE, mostly
261+
// testing integrations with newer Web features not supported by it.
262+
QUnit.isIE = !!window.document.documentMode;
263+
QUnit.testUnlessIE = QUnit.isIE ? QUnit.skip : QUnit.test;
267264

268265
this.loadTests = function() {
269266

‎test/middleware-mockserver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ var mocks = {
138138
"constructor": "prototype collision (constructor)"
139139
} );
140140
req.query.keys.split( "|" ).forEach( function( key ) {
141-
if ( req.headers[ key.toLowerCase() ] ) {
141+
if ( key.toLowerCase() in req.headers ) {
142142
resp.write( key + ": " + req.headers[ key.toLowerCase() ] + "\n" );
143143
}
144144
} );

‎test/unit/ajax.js

+7-12
Original file line numberDiff line numberDiff line change
@@ -260,19 +260,20 @@ QUnit.module( "ajax", {
260260
} );
261261
},
262262
url: url( "mock.php?action=headers&keys=siMPle|SometHing-elsE|OthEr|Nullable|undefined|Empty|ajax-send" ),
263-
headers: {
263+
headers: supportjQuery.extend( {
264264
"siMPle": "value",
265265
"SometHing-elsE": "other value",
266266
"OthEr": "something else",
267267
"Nullable": null,
268268
"undefined": undefined
269269

270270
// Support: IE 9 - 11+, Edge 12 - 14 only
271-
// Not all browsers allow empty-string headers
272-
//"Empty": ""
273-
},
271+
// IE can receive empty headers but not send them.
272+
}, QUnit.isIE ? {} : {
273+
"Empty": ""
274+
} ),
274275
success: function( data, _, xhr ) {
275-
var i, emptyHeader,
276+
var i,
276277
requestHeaders = jQuery.extend( this.headers, {
277278
"ajax-send": "test"
278279
} ),
@@ -285,13 +286,7 @@ QUnit.module( "ajax", {
285286
assert.strictEqual( data, tmp, "Headers were sent" );
286287
assert.strictEqual( xhr.getResponseHeader( "Sample-Header" ), "Hello World", "Sample header received" );
287288
assert.ok( data.indexOf( "undefined" ) < 0, "Undefined header value was not sent" );
288-
289-
emptyHeader = xhr.getResponseHeader( "Empty-Header" );
290-
if ( emptyHeader === null ) {
291-
assert.ok( true, "Firefox doesn't support empty headers" );
292-
} else {
293-
assert.strictEqual( emptyHeader, "", "Empty header received" );
294-
}
289+
assert.strictEqual( xhr.getResponseHeader( "Empty-Header" ), "", "Empty header received" );
295290
assert.strictEqual( xhr.getResponseHeader( "Sample-Header2" ), "Hello World 2", "Second sample header received" );
296291
assert.strictEqual( xhr.getResponseHeader( "List-Header" ), "Item 1, Item 2", "List header received" );
297292
assert.strictEqual( xhr.getResponseHeader( "constructor" ), "prototype collision (constructor)", "constructor header received" );

0 commit comments

Comments
 (0)