Skip to content

Commit

Permalink
Core: Use Array.prototype.flat where supported
Browse files Browse the repository at this point in the history
Calling `Array.prototype.concat.apply( [], inputArray )` to flatten `inputArray`
crashes for large arrays; using `Array.prototype.flat` avoids these issues in
browsers that support it. In case it's necessary to support these large arrays
even in older browsers, a polyfill for `Array.prototype.flat` can be loaded.
This is already being done by many applications.

Fixes gh-4320
Closes gh-4459
  • Loading branch information
aelafifi authored and mgol committed Sep 24, 2019
1 parent aa6344b commit 9df4f1d
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/core.js
Expand Up @@ -6,7 +6,7 @@ define( [
"./var/arr",
"./var/getProto",
"./var/slice",
"./var/concat",
"./var/flat",
"./var/push",
"./var/indexOf",
"./var/class2type",
Expand All @@ -18,7 +18,7 @@ define( [
"./var/isWindow",
"./core/DOMEval",
"./core/toType"
], function( arr, getProto, slice, concat, push, indexOf,
], function( arr, getProto, slice, flat, push, indexOf,
class2type, toString, hasOwn, fnToString, ObjectFunctionString,
support, isWindow, DOMEval, toType ) {

Expand Down Expand Up @@ -397,7 +397,7 @@ jQuery.extend( {
}

// Flatten any nested arrays
return concat.apply( [], ret );
return flat( ret );
},

// A global GUID counter for objects
Expand Down
6 changes: 3 additions & 3 deletions src/manipulation.js
@@ -1,7 +1,7 @@
define( [
"./core",
"./core/isAttached",
"./var/concat",
"./var/flat",
"./var/isIE",
"./var/push",
"./core/access",
Expand All @@ -22,7 +22,7 @@ define( [
"./traversing",
"./selector",
"./event"
], function( jQuery, isAttached, concat, isIE, push, access, rtagName,
], function( jQuery, isAttached, flat, isIE, push, access, rtagName,
rscriptType, wrapMap, getAll, setGlobalEval, buildFragment,
dataPriv, dataUser, acceptData, DOMEval, nodeName ) {

Expand Down Expand Up @@ -103,7 +103,7 @@ function cloneCopyEvent( src, dest ) {
function domManip( collection, args, callback, ignored ) {

// Flatten any nested arrays
args = concat.apply( [], args );
args = flat( args );

var fragment, first, scripts, hasScripts, node, doc,
i = 0,
Expand Down
7 changes: 0 additions & 7 deletions src/var/concat.js

This file was deleted.

15 changes: 15 additions & 0 deletions src/var/flat.js
@@ -0,0 +1,15 @@
define( [
"./arr"
], function( arr ) {

"use strict";

// Support: IE 11+, Edge 18+
// Provide fallback for browsers without Array#flat.
return arr.flat ? function( array ) {
return arr.flat.call( array );
} : function( array ) {
return arr.concat.apply( [], array );
};

} );
19 changes: 18 additions & 1 deletion test/unit/core.js
Expand Up @@ -681,7 +681,7 @@ QUnit.test( "map()", function( assert ) {
} );

QUnit.test( "jQuery.map", function( assert ) {
assert.expect( 25 );
assert.expect( 28 );

var i, label, result, callback;

Expand Down Expand Up @@ -781,6 +781,23 @@ QUnit.test( "jQuery.map", function( assert ) {
return k % 2 ? k : [ k, k, k ];
} );
assert.equal( result.join( "" ), "00012223", "Array results flattened (#2616)" );

result = jQuery.map( [ [ [ 1, 2 ], 3 ], 4 ], function( v, k ) {
return v;
} );
assert.equal( result.length, 3, "Array flatten only one level down" );
assert.ok( Array.isArray( result[ 0 ] ), "Array flatten only one level down" );

// Support: IE 11+, Edge 18+
// Skip the test in browsers without Array#flat.
if ( Array.prototype.flat ) {
result = jQuery.map( Array( 300000 ), function( v, k ) {
return k;
} );
assert.equal( result.length, 300000, "Able to map 300000 records without any problems (#4320)" );
} else {
assert.ok( "skip", "Array#flat doesn't supported on all browsers" );
}
} );

QUnit.test( "jQuery.merge()", function( assert ) {
Expand Down

0 comments on commit 9df4f1d

Please sign in to comment.