Merge "Replace deprecated jQuery.isArray by Array.isArray"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Apr 2017 21:27:55 +0000 (21:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Apr 2017 21:27:55 +0000 (21:27 +0000)
1  2 
resources/src/mediawiki/mediawiki.js

                        var results, i;
                        fallback = arguments.length > 1 ? fallback : null;
  
-                       if ( $.isArray( selection ) ) {
+                       if ( Array.isArray( selection ) ) {
                                results = {};
                                for ( i = 0; i < selection.length; i++ ) {
                                        if ( typeof selection[ i ] === 'string' ) {
                 */
                exists: function ( selection ) {
                        var i;
-                       if ( $.isArray( selection ) ) {
+                       if ( Array.isArray( selection ) ) {
                                for ( i = 0; i < selection.length; i++ ) {
                                        if ( typeof selection[ i ] !== 'string' || !hasOwn.call( this.values, selection[ i ] ) ) {
                                                return false;
                         * @return {string} Hash of concatenated version hashes.
                         */
                        function getCombinedVersion( modules ) {
 -                              var hashes = $.map( modules, function ( module ) {
 +                              var hashes = modules.map( function ( module ) {
                                        return registry[ module ].version;
                                } );
                                return fnv132( hashes.join( '' ) );
  
                                        legacyWait.always( function () {
                                                try {
-                                                       if ( $.isArray( script ) ) {
+                                                       if ( Array.isArray( script ) ) {
                                                                nestedAddScript( script, markModuleReady, 0 );
                                                        } else if ( typeof script === 'function' ) {
                                                                // Pass jQuery twice so that the signature of the closure which wraps
  
                                                // Array of css strings in key 'css',
                                                // or back-compat array of urls from media-type
-                                               if ( $.isArray( value ) ) {
+                                               if ( Array.isArray( value ) ) {
                                                        for ( i = 0; i < value.length; i++ ) {
                                                                if ( key === 'bc-url' ) {
                                                                        // back-compat: { <media>: [url, ..] }
                                 * @return {Array}
                                 */
                                getModuleNames: function () {
 -                                      return $.map( registry, function ( i, key ) {
 -                                              return key;
 -                                      } );
 +                                      return Object.keys( registry );
                                },
  
                                /**
                // for all loading modules. If one fails, fall back to tracking each module
                // separately via $.when(), this is expensive.
                loading = mw.loader.using( loading ).then( null, function () {
 -                      var all = $.map( loading, function ( module ) {
 +                      var all = loading.map( function ( module ) {
                                return mw.loader.using( module ).then( null, function () {
                                        return $.Deferred().resolve();
                                } );