From e7361de181dcadbcc7c32de92b3498c9fb9d0193 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Sun, 22 Jun 2014 01:48:16 -0700
Subject: [PATCH] Add OutputPageScriptsForBottomQueue hook

This allows for extensions to add specific modules into the bottom
queue.

Bug: 62602
Change-Id: Ifccac7889e80b2f674cd54bb4ad3e53c6aa1dfa1
---
 RELEASE-NOTES-1.24      |  2 ++
 docs/hooks.txt          |  8 ++++++++
 includes/OutputPage.php | 10 +++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 197fd243e6..d76cd29a76 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -118,6 +118,8 @@ production.
 * Upgrade jQuery Cookie to v1.2.0.
 * (bug 20476) Add a "viewsuppressed" user right to be able to view
   suppressed content but not suppress it ("suppressrevision" right).
+* Added a new hook, "OutputPageScriptsForBottomQueue", to add modules to the
+  bottom queue that should be requested in a dedicated <script> request.
 
 === Bug fixes in 1.24 ===
 * (bug 49116) Footer copyright notice is now always displayed in user language
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 065c7d303a..3ee122196d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1871,6 +1871,14 @@ $categories: associative array, keys are category names, values are category
 $links: array, intended to hold the result. Must be an associative array with
   category types as keys and arrays of HTML links as values.
 
+'OutputPageScriptsForBottomQueue': Allows adding modules to the bottom queue
+that should be requested in a dedicated <script> request. In most cases you'll
+want to use OutputPage::addModules instead (from another hook) which allows
+ResourceLoader to better combine requests and allows the module load requests
+to be cached better. Typically you'd only use this for user-specific modules.
+$out: OutputPage instance
+&$modules: Array of modules names to add to the bottom queue
+
 'PageContentInsertComplete': After a new article is created.
 $wikiPage: WikiPage created
 $user: User creating the article
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0dca0da640..19b2240300 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2895,7 +2895,7 @@ $templates
 
 		// Startup - this will immediately load jquery and mediawiki modules
 		$links = array();
-		$links[] = $this->makeResourceLoaderLink( 'startup', ResourceLoaderModule::TYPE_SCRIPTS, true );
+		$links[] = $this->makeResourceLoaderLink( 'startup', ResourceLoaderModule::TYPE_SCRIPTS, /* $useESI =  */ true );
 
 		// Load config before anything else
 		$links[] = Html::inlineScript(
@@ -3017,6 +3017,14 @@ $templates
 			/* $useESI = */ false, /* $extraQuery = */ array(), /* $loadCall = */ $inHead
 		);
 
+		$modules = array();
+		wfRunHooks( 'OutputPageScriptsForBottomQueue', array( $this, &$modules ) );
+		if ( $modules ) {
+			$links[] = $this->makeResourceLoaderLink( $modules, ResourceLoaderModule::TYPE_COMBINED,
+				/* $useESI = */ false, /* $extraQuery = */ array(), /* $loadCall = */ $inHead
+			);
+		}
+
 		return self::getHtmlFromLoaderLinks( $links );
 	}
 
-- 
2.20.1