debug: Merge mediawiki.debug.init module into mediawiki.debug

It just calls mw.Debug.init() on document ready, which can easily be
done inside mediawiki.debug.

Change-Id: Ifaa5a4884c9e430241a4bff51454bb96f468cd61

diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php
index 58387ed..8acf04e 100644 (file)
--- a/includes/debug/MWDebug.php
+++ b/includes/debug/MWDebug.php
@@ -93,7 +93,7 @@ class MWDebug {
         */
        public static function addModules( OutputPage $out ) {
                if ( self::$enabled ) {
-                       $out->addModules( 'mediawiki.debug.init' );
+                       $out->addModules( 'mediawiki.debug' );
                }
        }
 

diff --git a/resources/Resources.php b/resources/Resources.php
index cfaaf5f..76c5191 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -980,11 +980,6 @@ return [
                'dependencies' => [
                        'jquery.footHovzer',
                ],
-               'position' => 'bottom',
-       ],
-       'mediawiki.debug.init' => [
-               'scripts' => 'resources/src/mediawiki/mediawiki.debug.init.js',
-               'dependencies' => 'mediawiki.debug',
                // Uses a custom mw.config variable that is set in debughtml,
                // must be loaded on the bottom
                'position' => 'bottom',

diff --git a/resources/src/mediawiki/mediawiki.debug.init.js b/resources/src/mediawiki/mediawiki.debug.init.js
deleted file mode 100644 (file)
index 0f85e80..0000000
--- a/resources/src/mediawiki/mediawiki.debug.init.js
+++ /dev/null
@@ -1,3 +0,0 @@
-jQuery( function () {
-       mediaWiki.Debug.init();
-} );

diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki/mediawiki.debug.js
index f721009..26c74a1 100644 (file)
--- a/resources/src/mediawiki/mediawiki.debug.js
+++ b/resources/src/mediawiki/mediawiki.debug.js
@@ -381,4 +381,8 @@
                }
        };
 
+       $( function () {
+               debug.init();
+       } );
+
 }( mediaWiki, jQuery ) );