From: Timo Tijhof Date: Fri, 21 Aug 2015 15:05:59 +0000 (+0200) Subject: resourceloader: Remove old experimental "AsyncLoading" feature X-Git-Tag: 1.31.0-rc.0~10322 X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=79ae8460480a40c536eaa03ac2d2d0f5a4f979ea;p=lhc%2Fweb%2Fwiklou.git resourceloader: Remove old experimental "AsyncLoading" feature Follows-up d7905627fdc3 which makes all script loading asynchronous, thus obsoleting this experiment. We do still have separate top and bottom queues, but that's tracked under T109837 for later consideration. Change-Id: I1d6ea47c59bb47977594aff94952a38cc0a9ce34 --- diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26 index 441a649286..2774a27589 100644 --- a/RELEASE-NOTES-1.26 +++ b/RELEASE-NOTES-1.26 @@ -22,6 +22,9 @@ production. the "Signature" button on the edit toolbar will be displayed. * $wgResourceLoaderUseESI was deprecated and removed. This was an experimental feature that was never enabled by default. +* $wgResourceLoaderExperimentalAsyncLoading was deprecated and removed. + This experimental feature was never enabled by default and is obsolete as of + MediaWiki 1.26, in where ResourceLoader became fully asynchronous. === New features in 1.26 === * (T51506) Now action=info gives estimates of actual watchers for a page. @@ -59,6 +62,8 @@ production. by Special:Random to select random pages. * $wgTransactionalTimeLimit was added, which controls the request time limit for potentially slow POST requests that need to be as atomic as possible. +* ResourceLoader now loads all scripts asynchronously. The top-queue and + startup modules are no longer synchronously loaded. ==== External libraries ==== * Update es5-shim from v4.0.0 to v4.1.5. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c757b108b7..f1e8f44fda 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3617,13 +3617,6 @@ $wgResourceLoaderValidateJS = true; */ $wgResourceLoaderValidateStaticJS = false; -/** - * If set to true, asynchronous loading of bottom-queue scripts in the "" - * will be enabled. This is an experimental feature that's supposed to make - * JavaScript load faster. - */ -$wgResourceLoaderExperimentalAsyncLoading = false; - /** * Global LESS variables. An associative array binding variable names to * LESS code snippets representing their values. diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 8d4720b610..073762a035 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2996,10 +2996,6 @@ class OutputPage extends ContextSource { // Startup - this provides the client with the module manifest and loads jquery and mediawiki base modules $links[] = $this->makeResourceLoaderLink( 'startup', ResourceLoaderModule::TYPE_SCRIPTS ); - if ( $this->getConfig()->get( 'ResourceLoaderExperimentalAsyncLoading' ) ) { - $links[] = $this->getScriptsForBottomQueue(); - } - return self::getHtmlFromLoaderLinks( $links ); } @@ -3054,11 +3050,9 @@ class OutputPage extends ContextSource { } /** - * JS stuff to put at the 'bottom', which can either be the bottom of the - * "" or the bottom of the "" depending on - * $wgResourceLoaderExperimentalAsyncLoading: modules marked with position - * 'bottom', legacy scripts ($this->mScripts), user preferences, site JS - * and user JS. + * JS stuff to put at the 'bottom', which goes at the bottom of the ``. + * These are modules marked with position 'bottom', legacy scripts ($this->mScripts), + * site JS, and user JS. * * @param bool $unused Previously used to let this method change its output based * on whether it was called by getExternalHeadScripts() or getBottomScripts(). @@ -3142,10 +3136,6 @@ class OutputPage extends ContextSource { // In case the skin wants to add bottom CSS $this->getSkin()->setupSkinUserCss( $this ); - if ( $this->getConfig()->get( 'ResourceLoaderExperimentalAsyncLoading' ) ) { - // Already handled by getExternalHeadScripts() - return ''; - } return $this->getScriptsForBottomQueue(); }