From 2ea420eed86d679bcc730a396d02b98e8c857157 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Mon, 2 Feb 2015 23:29:28 +0000 Subject: [PATCH] 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 --- resources/Resources.php | 5 ++++- resources/src/mediawiki/mediawiki.js | 7 ------- resources/src/mediawiki/mediawiki.startUp.js | 12 ++++++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 resources/src/mediawiki/mediawiki.startUp.js 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 ) ); -- 2.20.1