http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72752
Revision: 72752
Author: tparscal
Date: 2010-09-10 20:45:58 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Merged load and go. At least for now, this seems to make sense.
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2010-09-10 20:45:17 UTC (rev
72751)
+++ trunk/phase3/includes/OutputPage.php 2010-09-10 20:45:58 UTC (rev
72752)
@@ -2340,13 +2340,10 @@
// 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} ); }"
+ "if ( mediaWiki !== undefined ) {
mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
);
}
- // Add code to fetch all requested modules
- $scripts .= Html::inlineScript( "if ( mediaWiki !== undefined )
{ mediaWiki.loader.go(); }" );
-
// TODO: User Scripts should be included using the resource
loader
// Add user JS if enabled
if( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
