Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188326
Change subject: Separate startUp() call from main script of mediawiki module
......................................................................
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
---
M includes/resourceloader/ResourceLoaderStartUpModule.php
M resources/Resources.php
M resources/src/mediawiki/mediawiki.js
A resources/src/mediawiki/mediawiki.startUp.js
4 files changed, 16 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/188326/1
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 48b3576..a2d2fe0 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -295,7 +295,7 @@
* @return array
*/
public static function getStartupModules() {
- return array( 'jquery', 'mediawiki' );
+ return array( 'jquery', 'mediawiki', 'mediawiki.startUp' );
}
/**
diff --git a/resources/Resources.php b/resources/Resources.php
index 6e8cd99..2e66ec5 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -953,6 +953,10 @@
'mediawiki.api',
),
),
+ 'mediawiki.startUp' => array(
+ 'scripts' => 'resources/src/mediawiki/mediawiki.startUp.js',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
'mediawiki.Title' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.Title.js',
'dependencies' => array(
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index bed5cb5..98a2f6a 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 0000000..03b51c4
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.startUp.js
@@ -0,0 +1,11 @@
+/**
+ * Auto-register from pre-loaded startup scripts
+ */
+( function ( $ ) {
+ 'use strict';
+
+ if ( $.isFunction( window.startUp ) ) {
+ window.startUp();
+ window.startUp = undefined;
+ }
+}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/188326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41177b730a7370b4c9ca13d758d9f8493ff5192e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
