Merge "Create a custom log formatter that allows log entries to contain wikitext"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.inspect.js

diff --git a/resources/src/mediawiki/mediawiki.inspect.js b/resources/src/mediawiki/mediawiki.inspect.js
index 9332773..6478fd9 100644 (file)
--- a/resources/src/mediawiki/mediawiki.inspect.js
+++ b/resources/src/mediawiki/mediawiki.inspect.js
@@ -10,6 +10,7 @@
 ( function ( mw, $ ) {
 
        var inspect,
+               byteLength = require( 'mediawiki.String' ).byteLength,
                hasOwn = Object.prototype.hasOwnProperty;
 
        function sortByProperty( array, prop, descending ) {
@@ -47,7 +48,7 @@
                        var modules = inspect.getLoadedModules(),
                                graph = {};
 
-                       $.each( modules, function ( moduleIndex, moduleName ) {
+                       modules.forEach( function ( moduleName ) {
                                var dependencies = mw.loader.moduleRegistry[ moduleName ].dependencies || [];
 
                                if ( !hasOwn.call( graph, moduleName ) ) {
@@ -55,7 +56,7 @@
                                }
                                graph[ moduleName ].requires = dependencies;
 
-                               $.each( dependencies, function ( depIndex, depName ) {
+                               dependencies.forEach( function ( depName ) {
                                        if ( !hasOwn.call( graph, depName ) ) {
                                                graph[ depName ] = { requiredBy: [] };
                                        }
@@ -117,9 +118,9 @@
                        size = 0;
                        for ( i = 0; i < args.length; i++ ) {
                                if ( typeof args[ i ] === 'function' ) {
-                                       size += $.byteLength( getFunctionBody( args[ i ] ) );
+                                       size += byteLength( getFunctionBody( args[ i ] ) );
                                } else {
-                                       size += $.byteLength( JSON.stringify( args[ i ] ) );
+                                       size += byteLength( JSON.stringify( args[ i ] ) );
                                }
                        }
 
@@ -164,7 +165,7 @@
                 * @return {Array} List of module names
                 */
                getLoadedModules: function () {
-                       return $.grep( mw.loader.getModuleNames(), function ( module ) {
+                       return mw.loader.getModuleNames().filter( function ( module ) {
                                return mw.loader.getState( module ) === 'ready';
                        } );
                },
@@ -206,7 +207,7 @@
                                Array.prototype.slice.call( arguments ) :
                                $.map( inspect.reports, function ( v, k ) { return k; } );
 
-                       $.each( reports, function ( index, name ) {
+                       reports.forEach( function ( name ) {
                                inspect.dumpTable( inspect.reports[ name ]() );
                        } );
                },
@@ -224,7 +225,7 @@
                         */
                        size: function () {
                                // Map each module to a descriptor object.
-                               var modules = $.map( inspect.getLoadedModules(), function ( module ) {
+                               var modules = inspect.getLoadedModules().map( function ( module ) {
                                        return {
                                                name: module,
                                                size: inspect.getModuleSize( module )
@@ -235,7 +236,7 @@
                                sortByProperty( modules, 'size', true );
 
                                // Convert size to human-readable string.
-                               $.each( modules, function ( i, module ) {
+                               modules.forEach( function ( module ) {
                                        module.sizeInBytes = module.size;
                                        module.size = humanSize( module.size );
                                } );
@@ -252,7 +253,7 @@
                        css: function () {
                                var modules = [];
 
-                               $.each( inspect.getLoadedModules(), function ( index, name ) {
+                               inspect.getLoadedModules().forEach( function ( name ) {
                                        var css, stats, module = mw.loader.moduleRegistry[ name ];
 
                                        try {
@@ -285,8 +286,8 @@
                                        $.extend( stats, mw.loader.store.stats );
                                        try {
                                                raw = localStorage.getItem( mw.loader.store.getStoreKey() );
-                                               stats.totalSizeInBytes = $.byteLength( raw );
-                                               stats.totalSize = humanSize( $.byteLength( raw ) );
+                                               stats.totalSizeInBytes = byteLength( raw );
+                                               stats.totalSize = humanSize( byteLength( raw ) );
                                        } catch ( e ) {}
                                }
                                return [ stats ];
@@ -306,7 +307,7 @@
                                pattern = new RegExp( mw.RegExp.escape( pattern ), 'g' );
                        }
 
-                       return $.grep( inspect.getLoadedModules(), function ( moduleName ) {
+                       return inspect.getLoadedModules().filter( function ( moduleName ) {
                                var module = mw.loader.moduleRegistry[ moduleName ];
 
                                // Grep module's JavaScript