From b71ff434dde309e3b479c755d3d8448237a35b59 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Wed, 24 Aug 2016 16:00:09 -0700
Subject: [PATCH] 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
---
 includes/debug/MWDebug.php                      | 2 +-
 resources/Resources.php                         | 5 -----
 resources/src/mediawiki/mediawiki.debug.init.js | 3 ---
 resources/src/mediawiki/mediawiki.debug.js      | 4 ++++
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 resources/src/mediawiki/mediawiki.debug.init.js

diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php
index 58387edb5e..8acf04e0d2 100644
--- 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 cfaaf5f1bd..76c5191cda 100644
--- 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
index 0f85e80d6a..0000000000
--- 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 f721009537..26c74a1af7 100644
--- a/resources/src/mediawiki/mediawiki.debug.js
+++ b/resources/src/mediawiki/mediawiki.debug.js
@@ -381,4 +381,8 @@
 		}
 	};
 
+	$( function () {
+		debug.init();
+	} );
+
 }( mediaWiki, jQuery ) );
-- 
2.20.1