Merge "Separate startUp() call from main script of mediawiki module"

diff --combined resources/Resources.php
index 835e33f,efe3d98..2896171
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -765,7 -765,10 +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' ),
@@@ -1073,9 -1076,7 +1076,9 @@@
        'mediawiki.action.history.diff' => array(
                'styles' => array(
                        'resources/src/mediawiki.action/mediawiki.action.history.diff.css',
 -                      'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => array( 'media' => 'print' ),
 +                      'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => array(
 +                              'media' => 'print'
 +                      ),
                ),
                'group' => 'mediawiki.action.history',
                'targets' => array( 'desktop', 'mobile' ),