Core: Deprecate jQuery.isArray

Fixes gh-2961
Closes gh-3278

diff --git a/src/attributes/val.js b/src/attributes/val.js
index fbf406929e26169f4107f8b5f9a3fba1fe12bc6b..9245e4e0abfdf4bf0d5a394ad5fdb9466291e289 100644 (file)
--- a/src/attributes/val.js
+++ b/src/attributes/val.js
@@ -62,7 +62,7 @@ jQuery.fn.extend( {
                        } else if ( typeof val === "number" ) {
                                val += "";
 
-                       } else if ( jQuery.isArray( val ) ) {
+                       } else if ( Array.isArray( val ) ) {
                                val = jQuery.map( val, function( value ) {
                                        return value == null ? "" : value + "";
                                } );
@@ -173,7 +173,7 @@ jQuery.extend( {
 jQuery.each( [ "radio", "checkbox" ], function() {
        jQuery.valHooks[ this ] = {
                set: function( elem, value ) {
-                       if ( jQuery.isArray( value ) ) {
+                       if ( Array.isArray( value ) ) {
                                return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
                        }
                }

diff --git a/src/core.js b/src/core.js
index f3983b4a83ab502a209a6fef73cf9292d314b13c..c99f27e224d301500898c59f341f4a5f73b638e0 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -172,11 +172,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 
                                // Recurse if we're merging plain objects or arrays
                                if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-                                       ( copyIsArray = jQuery.isArray( copy ) ) ) ) {
+                                       ( copyIsArray = Array.isArray( copy ) ) ) ) {
 
                                        if ( copyIsArray ) {
                                                copyIsArray = false;
-                                               clone = src && jQuery.isArray( src ) ? src : [];
+                                               clone = src && Array.isArray( src ) ? src : [];
 
                                        } else {
                                                clone = src && jQuery.isPlainObject( src ) ? src : {};
@@ -215,8 +215,6 @@ jQuery.extend( {
                return jQuery.type( obj ) === "function";
        },
 
-       isArray: Array.isArray,
-
        isWindow: function( obj ) {
                return obj != null && obj === obj.window;
        },

diff --git a/src/css.js b/src/css.js
index 5e445119396c99be2c3e6aa892b35c4944fe0806..c17265ced5547217ad079b0bee8b2f977c8bb3ba 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -404,7 +404,7 @@ jQuery.fn.extend( {
                                map = {},
                                i = 0;
 
-                       if ( jQuery.isArray( name ) ) {
+                       if ( Array.isArray( name ) ) {
                                styles = getStyles( elem );
                                len = name.length;
 

diff --git a/src/data/Data.js b/src/data/Data.js
index 43ae01623b4ffb9e3d208c7acf9812a61a42feb2..8c856c0392c77eb8c086cbcacfa8095a6bd74f35 100644 (file)
--- a/src/data/Data.js
+++ b/src/data/Data.js
@@ -115,7 +115,7 @@ Data.prototype = {
                if ( key !== undefined ) {
 
                        // Support array or space separated string of keys
-                       if ( jQuery.isArray( key ) ) {
+                       if ( Array.isArray( key ) ) {
 
                                // If key is an array of keys...
                                // We always set camelCase keys, so remove that.

diff --git a/src/deprecated.js b/src/deprecated.js
index 9fcc6b7daa70dd6889a30f8ded898264a79a9a22..0329b95640ebb3a365c7df3836a61f017f3199ea 100644 (file)
--- a/src/deprecated.js
+++ b/src/deprecated.js
@@ -25,6 +25,7 @@ jQuery.fn.extend( {
        }
 } );
 
+jQuery.isArray = Array.isArray;
 jQuery.parseJSON = JSON.parse;
 
 } );

diff --git a/src/effects.js b/src/effects.js
index 68af96c61a96e6fabdc4e256b207483e194c7594..4823659c230d466ef2f416bc36ae8bf26bde890f 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -256,7 +256,7 @@ function propFilter( props, specialEasing ) {
                name = jQuery.camelCase( index );
                easing = specialEasing[ name ];
                value = props[ index ];
-               if ( jQuery.isArray( value ) ) {
+               if ( Array.isArray( value ) ) {
                        easing = value[ 1 ];
                        value = props[ index ] = value[ 0 ];
                }

diff --git a/src/queue.js b/src/queue.js
index 3a626a2fc3f9931510ce204c6934682349915611..fbbbeab71aa492fc20066cccf7ebcf3a13872549 100644 (file)
--- a/src/queue.js
+++ b/src/queue.js
@@ -17,7 +17,7 @@ jQuery.extend( {
 
                        // Speed up dequeue by getting out quickly if this is just a lookup
                        if ( data ) {
-                               if ( !queue || jQuery.isArray( data ) ) {
+                               if ( !queue || Array.isArray( data ) ) {
                                        queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
                                } else {
                                        queue.push( data );

diff --git a/src/serialize.js b/src/serialize.js
index 35dcf04f9b22bfa2cc2b182ef7608de3db4cebe9..2e28ce1e007dfd4d7e8e37162e9fc821f00848c5 100644 (file)
--- a/src/serialize.js
+++ b/src/serialize.js
@@ -17,7 +17,7 @@ var
 function buildParams( prefix, obj, traditional, add ) {
        var name;
 
-       if ( jQuery.isArray( obj ) ) {
+       if ( Array.isArray( obj ) ) {
 
                // Serialize array item.
                jQuery.each( obj, function( i, v ) {
@@ -69,7 +69,7 @@ jQuery.param = function( a, traditional ) {
                };
 
        // If an array was passed in, assume that it is an array of form elements.
-       if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+       if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
 
                // Serialize the form elements
                jQuery.each( a, function() {
@@ -115,7 +115,7 @@ jQuery.fn.extend( {
                                return null;
                        }
 
-                       if ( jQuery.isArray( val ) ) {
+                       if ( Array.isArray( val ) ) {
                                return jQuery.map( val, function( val ) {
                                        return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
                                } );

diff --git a/test/data/testinit.js b/test/data/testinit.js
index ef210e739500cc407d356a3a2112061ed3fa7515..c37687f6873eaee2d52fc729bffd7f8db2fd2c70 100644 (file)
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -169,7 +169,7 @@ this.ajaxTest = function( title, expect, options ) {
                }
                options = options || [];
                requestOptions = options.requests || options.request || options;
-               if ( !jQuery.isArray( requestOptions ) ) {
+               if ( !Array.isArray( requestOptions ) ) {
                        requestOptions = [ requestOptions ];
                }
 

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index e5ca013890347b2517d6a13169974fa3399ba3b3..0784ae0a82431c8432879209e67a6b4dfc48986a 100644 (file)
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -35,7 +35,7 @@ QUnit.assert.expectJqData = function( env, elems, key ) {
                if ( elems.jquery && elems.toArray ) {
                        elems = elems.toArray();
                }
-               if ( !supportjQuery.isArray( elems ) ) {
+               if ( !Array.isArray( elems ) ) {
                        elems = [ elems ];
                }
 

diff --git a/test/unit/core.js b/test/unit/core.js
index f5083b4a91f0ad0c5a3f3056e814fd1ae6830883..2166576ec91779d30ae35bf882ed82b3f54f1ed0 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1161,7 +1161,7 @@ QUnit.test( "jQuery.extend(Object, Object)", function( assert ) {
        assert.ok( jQuery.extend( true, {}, nestedarray )[ "arr" ] !== arr, "Deep extend of object must clone child array" );
 
        // #5991
-       assert.ok( jQuery.isArray( jQuery.extend( true, { "arr": {} }, nestedarray )[ "arr" ] ), "Cloned array have to be an Array" );
+       assert.ok( Array.isArray( jQuery.extend( true, { "arr": {} }, nestedarray )[ "arr" ] ), "Cloned array have to be an Array" );
        assert.ok( jQuery.isPlainObject( jQuery.extend( true, { "arr": arr }, { "arr": {} } )[ "arr" ] ), "Cloned object have to be an plain object" );
 
        empty = {};
@@ -1282,7 +1282,7 @@ QUnit.test( "jQuery.extend(true,{},{a:[], o:{}}); deep copy with array, followed
        result = jQuery.extend( true, {}, initial );
 
        assert.deepEqual( result, initial, "The [result] and [initial] have equal shape and values" );
-       assert.ok( !jQuery.isArray( result.object ), "result.object wasn't paved with an empty array" );
+       assert.ok( !Array.isArray( result.object ), "result.object wasn't paved with an empty array" );
 } );
 
 QUnit.test( "jQuery.each(Object,Function)", function( assert ) {

diff --git a/test/unit/deprecated.js b/test/unit/deprecated.js
index 27ba1cf882a5ee6f2b4b91a76d5e71256fdddb18..b56af0ffe4c4895b65812550e596d510c50ec252 100644 (file)
--- a/test/unit/deprecated.js
+++ b/test/unit/deprecated.js
@@ -110,3 +110,9 @@ QUnit.test( "jQuery.parseJSON", function( assert ) {
 
        assert.strictEqual( jQuery.parseJSON( [ 0 ] ), 0, "Input cast to string" );
 } );
+
+QUnit.test( "jQuery.isArray", function( assert ) {
+       assert.expect( 1 );
+
+       assert.strictEqual( jQuery.isArray, Array.isArray, "Array.isArray equals jQuery.isArray" );
+} );

diff --git a/test/unit/queue.js b/test/unit/queue.js
index 2248c68d442d41a255cb90bc6b11149770694646..0a6862d6bd3e5bf51d7ed277a1deaa54bcbfc2fc 100644 (file)
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -128,7 +128,7 @@ QUnit.test( "jQuery.queue should return array while manipulating the queue", fun
 
        var div = document.createElement( "div" );
 
-       assert.ok( jQuery.isArray( jQuery.queue( div, "fx", jQuery.noop ) ), "jQuery.queue should return an array while manipulating the queue" );
+       assert.ok( Array.isArray( jQuery.queue( div, "fx", jQuery.noop ) ), "jQuery.queue should return an array while manipulating the queue" );
 } );
 
 QUnit.test( "delay()", function( assert ) {