http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72755
Revision: 72755
Author: tparscal
Date: 2010-09-10 20:55:28 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Adjusted comments
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2010-09-10 20:49:37 UTC (rev
72754)
+++ trunk/phase3/includes/OutputPage.php 2010-09-10 20:55:28 UTC (rev
72755)
@@ -2313,10 +2313,11 @@
// Statup - this will immediately load jquery and mediawiki
modules
$scripts = self::makeResourceLoaderLink( $sk, 'startup',
'scripts' );
- // Configuration
+ // Configuration -- this could be merged together with the load
and go, but makeGlobalVariablesScript returns a
+ // whole script tag -- grumble grumble
$scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName()
) . "\n";
- // Support individual script requests in debug mode
+ // Script and Messages "only"
if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal(
'debug' ) !== 'false' ) {
// Scripts
foreach ( $this->getModuleScripts() as $name ) {
@@ -2336,8 +2337,9 @@
$scripts .= self::makeResourceLoaderLink( $sk,
$this->getModuleMessages(), 'messages' );
}
}
+
+ // Modules - let the client calculate dependencies and batch
requests as it likes
if ( $this->getModules() ) {
- // Modules - let the client calculate dependencies and
batch requests as it likes
$modules = FormatJson::encode( $this->getModules() );
$scripts .= Html::inlineScript(
"if ( mediaWiki !== undefined ) {
mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
