From 163caec816e1497d0e987e836c8890f2b4a8be3d Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Fri, 10 Sep 2010 20:45:58 +0000 Subject: [PATCH] Merged load and go. At least for now, this seems to make sense. --- includes/OutputPage.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index e502f1ba0c..13b436f9a1 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2340,13 +2340,10 @@ class OutputPage { // 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() ) { -- 2.20.1