From: Gergő Tisza <gtisza@wikimedia.org>
Date: Mon, 2 Feb 2015 23:29:28 +0000 (+0000)
Subject: Separate startUp() call from main script of mediawiki module
X-Git-Tag: 1.31.0-rc.0~12474^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=2ea420eed86;p=lhc%2Fweb%2Fwiklou.git

Separate startUp() call from main script of mediawiki module

This allows adding new functionality to the startup module in
separate files, without further growing mediawiki.js.

Bug: T85263
Change-Id: I41177b730a7370b4c9ca13d758d9f8493ff5192e
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 6e8cd99df0..efe3d981c9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -765,7 +765,10 @@ return array(
 	/* MediaWiki */
 
 	'mediawiki' => array(
-		'scripts' => 'resources/src/mediawiki/mediawiki.js',
+		'scripts' => array(
+			'resources/src/mediawiki/mediawiki.js',
+			'resources/src/mediawiki/mediawiki.startUp.js',
+		),
 		'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
 		'raw' => true,
 		'targets' => array( 'desktop', 'mobile' ),
diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index bed5cb5b63..98a2f6a7f4 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2532,11 +2532,4 @@
 
 	// Attach to window and globally alias
 	window.mw = window.mediaWiki = mw;
-
-	// Auto-register from pre-loaded startup scripts
-	if ( $.isFunction( window.startUp ) ) {
-		window.startUp();
-		window.startUp = undefined;
-	}
-
 }( jQuery ) );
diff --git a/resources/src/mediawiki/mediawiki.startUp.js b/resources/src/mediawiki/mediawiki.startUp.js
new file mode 100644
index 0000000000..8032aa2cab
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.startUp.js
@@ -0,0 +1,12 @@
+/**
+ * Auto-register from pre-loaded startup scripts
+ * @ignore (this line will make JSDuck happy)
+ */
+( function ( $ ) {
+	'use strict';
+
+	if ( $.isFunction( window.startUp ) ) {
+		window.startUp();
+		window.startUp = undefined;
+	}
+}( jQuery ) );