2010-10-19 18:25:42 +00:00
|
|
|
<?php
|
|
|
|
|
/**
|
2012-04-30 07:16:10 +00:00
|
|
|
* Module for resource loader initialization.
|
|
|
|
|
*
|
2010-10-19 18:25:42 +00:00
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
|
*
|
|
|
|
|
* @file
|
|
|
|
|
* @author Trevor Parscal
|
|
|
|
|
* @author Roan Kattouw
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
class ResourceLoaderStartUpModule extends ResourceLoaderModule {
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
/* Protected Members */
|
|
|
|
|
|
|
|
|
|
protected $modifiedTime = array();
|
|
|
|
|
|
|
|
|
|
/* Protected Methods */
|
2011-02-08 23:09:22 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param $context ResourceLoaderContext
|
|
|
|
|
* @return array
|
|
|
|
|
*/
|
2010-10-19 18:25:42 +00:00
|
|
|
protected function getConfig( $context ) {
|
2011-05-10 23:17:13 +00:00
|
|
|
global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension,
|
|
|
|
|
$wgArticlePath, $wgScriptPath, $wgServer, $wgContLang,
|
(bug 40448) Replace legacy mwsuggest with mediawiki.searchSuggest
The module has been broken for a while now, but nobody noticed
because in plain core it is disabled by default, and in the
bundle we ship with Extension:Vector (and its SimpleSearch).
This commit removed the mediawiki.legacy.mwsuggest module (and
related components that become obsolete with its deletion) and
replaces it with the new mediawiki.searchSuggest module, which is
based on SimpleSearch from Extension:Vector (where it will be
removed soon).
The following and all references to it in core have been removed,
I also made sure that they weren't used in any of extensions/*.
Only matches in extensions/Settings and some file that dumped the startup module, and in extensions/Vector which are addressed in
I1d5bf81a8a0266c51c99d41eefacc0f4b3ae4b76.
Had to make a few updates to jquery.suggestions to make it work
in other skins. So far it was only used in Vector, but now that
it is used in mediawiki.searchSuggest, I noticed several issues
in other skins. Most importantly the fact that it assumed the
default offset was from the right corner, which isn't the case in
Monobook where the search bar is on the left (in the sidebar).
It now detects the appropiate origin corner automatically, and
also takes directionality of the page into account.
It also uses the correct font-size automatically. Previously it
used font-size: 0.8; but that only works in Vector. Every skin
seems to have its own way of making a sane font-size. In Monobook
the <body> has an extra small font-size which is then fixed in
div#globalWrapper, and in Vector it is extra large, which is then
fixed as well deeper in the document. Either way, the size on
<body> can't be used, and since this suggestions box is appended
to the <body> (it is a generic jQuery plugin without knowledge of
the document, and even if we could give it knowledge inside
the configuration, it'd have to be per-skin). So I removed the
Vector specific font-size and let it handle it automatically.
This was needed because it is now used in all skins.
Removed modules:
* mediawiki.legacy.mwsuggest:
> Replaced with mediawiki.searchSuggest.
Removed messages:
* search-mwsuggest-enabled
* search-mwsuggest-disabled
> No longer used.
Removed mw.config.values:
* wgMWSuggestTemplate
> Obsolete.
* wgSearchNamespaces
> Obsolete.
Removed server-side settings:
* $wgEnableMWSuggest
> Suggestions are now enabled by default and can be disabled
through the user preference `disablesuggest` still.
They can be disabled by default site-wide or hidden from
prefs through the standard mechanisms for that.
* $wgMWSuggestTemplate
> Obsolete.
Removed methods
* SearchEngine::getMWSuggestTemplate()
> Obsolete.
Filters:
$ ack mwsuggest -i -Q --ignore-dir=languages/messages
$ ack wgSearchNamespaces -Q
Message changes:
* vector-simplesearch-preference
> It was wrong, it didn't activate search suggestions, that
was handled by the Vector extension. This preference in
MediaWiki core controls whether the SimpleSearch bar HTML
and CSS will be used (e.g. the rectangle search box with
the magnifying class instead of the browser-default input
field with the plain submit buttons).
* searchsuggest-search
* searchsuggest-containing
These come from Extension:Vector message and should be imported
by translatewiki:
- vector-simplesearch-search
- vector-simplesearch-containing
Change-Id: Icd721011b40bb8d2c20aefa8b359a3e45413a07f
2012-09-23 01:06:53 +00:00
|
|
|
$wgVariantArticlePath, $wgActionPaths, $wgVersion,
|
|
|
|
|
$wgEnableAPI, $wgEnableWriteAPI, $wgDBname,
|
2011-06-16 05:13:29 +00:00
|
|
|
$wgSitename, $wgFileExtensions, $wgExtensionAssetsPath,
|
2011-12-28 22:29:07 +00:00
|
|
|
$wgCookiePrefix, $wgResourceLoaderMaxQueryLength;
|
2010-10-19 18:25:42 +00:00
|
|
|
|
|
|
|
|
$mainPage = Title::newMainPage();
|
2011-04-18 12:54:28 +00:00
|
|
|
|
2011-06-16 21:20:05 +00:00
|
|
|
/**
|
|
|
|
|
* Namespace related preparation
|
|
|
|
|
* - wgNamespaceIds: Key-value pairs of all localized, canonical and aliases for namespaces.
|
|
|
|
|
* - wgCaseSensitiveNamespaces: Array of namespaces that are case-sensitive.
|
|
|
|
|
*/
|
2011-06-14 22:49:38 +00:00
|
|
|
$namespaceIds = $wgContLang->getNamespaceIds();
|
2011-06-16 21:20:05 +00:00
|
|
|
$caseSensitiveNamespaces = array();
|
2011-06-14 22:49:38 +00:00
|
|
|
foreach( MWNamespace::getCanonicalNamespaces() as $index => $name ) {
|
2011-06-14 22:51:47 +00:00
|
|
|
$namespaceIds[$wgContLang->lc( $name )] = $index;
|
2011-06-16 21:20:05 +00:00
|
|
|
if ( !MWNamespace::isCapitalized( $index ) ) {
|
|
|
|
|
$caseSensitiveNamespaces[] = $index;
|
|
|
|
|
}
|
2011-06-14 22:49:38 +00:00
|
|
|
}
|
|
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
// Build list of variables
|
|
|
|
|
$vars = array(
|
|
|
|
|
'wgLoadScript' => $wgLoadScript,
|
|
|
|
|
'debug' => $context->getDebug(),
|
|
|
|
|
'skin' => $context->getSkin(),
|
|
|
|
|
'stylepath' => $wgStylePath,
|
|
|
|
|
'wgUrlProtocols' => wfUrlProtocols(),
|
|
|
|
|
'wgArticlePath' => $wgArticlePath,
|
|
|
|
|
'wgScriptPath' => $wgScriptPath,
|
|
|
|
|
'wgScriptExtension' => $wgScriptExtension,
|
|
|
|
|
'wgScript' => $wgScript,
|
|
|
|
|
'wgVariantArticlePath' => $wgVariantArticlePath,
|
2012-02-23 02:45:45 +00:00
|
|
|
// Force object to avoid "empty" associative array from
|
|
|
|
|
// becoming [] instead of {} in JS (bug 34604)
|
|
|
|
|
'wgActionPaths' => (object)$wgActionPaths,
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgServer' => $wgServer,
|
|
|
|
|
'wgUserLanguage' => $context->getLanguage(),
|
|
|
|
|
'wgContentLanguage' => $wgContLang->getCode(),
|
2011-05-15 13:21:16 +00:00
|
|
|
'wgVersion' => $wgVersion,
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgEnableAPI' => $wgEnableAPI,
|
|
|
|
|
'wgEnableWriteAPI' => $wgEnableWriteAPI,
|
2012-04-14 10:41:49 +00:00
|
|
|
'wgMainPageTitle' => $mainPage->getPrefixedText(),
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgFormattedNamespaces' => $wgContLang->getFormattedNamespaces(),
|
2011-06-14 22:49:38 +00:00
|
|
|
'wgNamespaceIds' => $namespaceIds,
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgSiteName' => $wgSitename,
|
2011-01-12 20:58:36 +00:00
|
|
|
'wgFileExtensions' => array_values( $wgFileExtensions ),
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgDBname' => $wgDBname,
|
2011-05-10 23:17:13 +00:00
|
|
|
// This sucks, it is only needed on Special:Upload, but I could
|
2011-01-22 22:34:36 +00:00
|
|
|
// not find a way to add vars only for a certain module
|
|
|
|
|
'wgFileCanRotate' => BitmapHandler::canRotate(),
|
2011-01-23 02:22:27 +00:00
|
|
|
'wgAvailableSkins' => Skin::getSkinNames(),
|
2011-02-16 14:28:26 +00:00
|
|
|
'wgExtensionAssetsPath' => $wgExtensionAssetsPath,
|
2011-05-10 23:17:13 +00:00
|
|
|
// MediaWiki sets cookies to have this prefix by default
|
2011-04-21 00:06:21 +00:00
|
|
|
'wgCookiePrefix' => $wgCookiePrefix,
|
2011-05-01 18:41:42 +00:00
|
|
|
'wgResourceLoaderMaxQueryLength' => $wgResourceLoaderMaxQueryLength,
|
2011-06-16 21:20:05 +00:00
|
|
|
'wgCaseSensitiveNamespaces' => $caseSensitiveNamespaces,
|
2010-10-19 18:25:42 +00:00
|
|
|
);
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2011-01-09 11:44:52 +00:00
|
|
|
wfRunHooks( 'ResourceLoaderGetConfigVars', array( &$vars ) );
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
return $vars;
|
|
|
|
|
}
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
/**
|
|
|
|
|
* Gets registration code for all modules
|
|
|
|
|
*
|
|
|
|
|
* @param $context ResourceLoaderContext object
|
|
|
|
|
* @return String: JavaScript code for registering all modules with the client loader
|
|
|
|
|
*/
|
|
|
|
|
public static function getModuleRegistrations( ResourceLoaderContext $context ) {
|
|
|
|
|
global $wgCacheEpoch;
|
|
|
|
|
wfProfileIn( __METHOD__ );
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
$out = '';
|
|
|
|
|
$registrations = array();
|
* Made Resources.php return a pure-data array instead of an ugly mix of data and code. This allows the class code to be lazy-loaded with the autoloader, for a performance advantage especially on non-APC installs. And using the convention where if the class is omitted, ResourceLoaderFileModule is assumed, the registration code becomes shorter and simpler.
* Modified ResourceLoader to lazy-initialise module objects, for a further performance advantage.
* Deleted ResourceLoader::getModules(), provided getModuleNames() instead. Although the startup module needs this functionality, it's slow to generate, so to avoid misuse, it's better to provide a foolproof fast interface and let the startup module do the slow thing itself.
* Modified ResourceLoader::register() to optionally accept an info array instead of an object.
* Added $wgResourceModules, allowing extensions to efficiently define their own resource loader modules. The trouble with hooks is that they contain code, and code is slow. We've been through all this before with i18n. Hooks are useful as a performance tool only if you call them very rarely.
* Moved ResourceLoader settings to their own section in DefaultSettings.php
* Added options to ResourceLoaderFileModule equivalent to the $localBasePath and $remoteBasePath parameters, to allow it to be instantiated via the new array style. Also added remoteExtPath, which allows modules to be registered before $wgExtensionAssetsPath is known.
* Added OutputPage::getResourceLoader(), mostly for debugging.
* The time saving at the moment is about 5ms per request with no extensions, which is significant already with 6 load.php requests for a cold cache page view. This is a much more scalable interface; the relative saving will grow as more extensions are added which use this interface, especially for non-APC installs.
Although the interface is backwards compatible, extension updates will follow in a subsequent commit.
2010-11-19 10:41:06 +00:00
|
|
|
$resourceLoader = $context->getResourceLoader();
|
2012-10-11 22:37:59 +00:00
|
|
|
$target = $context->getRequest()->getVal( 'target', 'desktop' );
|
2011-07-26 21:10:34 +00:00
|
|
|
|
|
|
|
|
// Register sources
|
|
|
|
|
$out .= ResourceLoader::makeLoaderSourcesScript( $resourceLoader->getSources() );
|
|
|
|
|
|
|
|
|
|
// Register modules
|
* Made Resources.php return a pure-data array instead of an ugly mix of data and code. This allows the class code to be lazy-loaded with the autoloader, for a performance advantage especially on non-APC installs. And using the convention where if the class is omitted, ResourceLoaderFileModule is assumed, the registration code becomes shorter and simpler.
* Modified ResourceLoader to lazy-initialise module objects, for a further performance advantage.
* Deleted ResourceLoader::getModules(), provided getModuleNames() instead. Although the startup module needs this functionality, it's slow to generate, so to avoid misuse, it's better to provide a foolproof fast interface and let the startup module do the slow thing itself.
* Modified ResourceLoader::register() to optionally accept an info array instead of an object.
* Added $wgResourceModules, allowing extensions to efficiently define their own resource loader modules. The trouble with hooks is that they contain code, and code is slow. We've been through all this before with i18n. Hooks are useful as a performance tool only if you call them very rarely.
* Moved ResourceLoader settings to their own section in DefaultSettings.php
* Added options to ResourceLoaderFileModule equivalent to the $localBasePath and $remoteBasePath parameters, to allow it to be instantiated via the new array style. Also added remoteExtPath, which allows modules to be registered before $wgExtensionAssetsPath is known.
* Added OutputPage::getResourceLoader(), mostly for debugging.
* The time saving at the moment is about 5ms per request with no extensions, which is significant already with 6 load.php requests for a cold cache page view. This is a much more scalable interface; the relative saving will grow as more extensions are added which use this interface, especially for non-APC installs.
Although the interface is backwards compatible, extension updates will follow in a subsequent commit.
2010-11-19 10:41:06 +00:00
|
|
|
foreach ( $resourceLoader->getModuleNames() as $name ) {
|
|
|
|
|
$module = $resourceLoader->getModule( $name );
|
2012-10-11 22:37:59 +00:00
|
|
|
$moduleTargets = $module->getTargets();
|
|
|
|
|
if ( in_array( $target, $moduleTargets ) ) {
|
|
|
|
|
$deps = $module->getDependencies();
|
|
|
|
|
$group = $module->getGroup();
|
|
|
|
|
$source = $module->getSource();
|
|
|
|
|
// Support module loader scripts
|
|
|
|
|
$loader = $module->getLoaderScript();
|
|
|
|
|
if ( $loader !== false ) {
|
|
|
|
|
$version = wfTimestamp( TS_ISO_8601_BASIC,
|
|
|
|
|
$module->getModifiedTime( $context ) );
|
|
|
|
|
$out .= ResourceLoader::makeCustomLoaderScript( $name, $version, $deps, $group, $source, $loader );
|
2010-10-19 18:25:42 +00:00
|
|
|
}
|
2012-10-11 22:37:59 +00:00
|
|
|
// Automatically register module
|
2011-07-26 21:10:34 +00:00
|
|
|
else {
|
2012-10-11 22:37:59 +00:00
|
|
|
// getModifiedTime() is supposed to return a UNIX timestamp, but it doesn't always
|
|
|
|
|
// seem to do that, and custom implementations might forget. Coerce it to TS_UNIX
|
|
|
|
|
$moduleMtime = wfTimestamp( TS_UNIX, $module->getModifiedTime( $context ) );
|
|
|
|
|
$mtime = max( $moduleMtime, wfTimestamp( TS_UNIX, $wgCacheEpoch ) );
|
|
|
|
|
// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
|
|
|
|
|
// mw.loader.register()
|
|
|
|
|
if ( !count( $deps ) && $group === null && $source === 'local' ) {
|
|
|
|
|
$registrations[] = array( $name, $mtime );
|
|
|
|
|
}
|
|
|
|
|
// Modules with dependencies but no group or foreign source pass three arguments
|
|
|
|
|
// (name, timestamp, dependencies) to mw.loader.register()
|
|
|
|
|
elseif ( $group === null && $source === 'local' ) {
|
|
|
|
|
$registrations[] = array( $name, $mtime, $deps );
|
|
|
|
|
}
|
|
|
|
|
// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
|
|
|
|
|
// to mw.loader.register()
|
|
|
|
|
elseif ( $source === 'local' ) {
|
|
|
|
|
$registrations[] = array( $name, $mtime, $deps, $group );
|
|
|
|
|
}
|
|
|
|
|
// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
|
|
|
|
|
// to mw.loader.register()
|
|
|
|
|
else {
|
|
|
|
|
$registrations[] = array( $name, $mtime, $deps, $group, $source );
|
|
|
|
|
}
|
2011-07-26 21:10:34 +00:00
|
|
|
}
|
2010-10-19 18:25:42 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$out .= ResourceLoader::makeLoaderRegisterScript( $registrations );
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
wfProfileOut( __METHOD__ );
|
|
|
|
|
return $out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Methods */
|
|
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
2012-05-11 19:16:29 +00:00
|
|
|
* @return bool
|
|
|
|
|
*/
|
|
|
|
|
public function isRaw() {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2011-05-21 17:45:20 +00:00
|
|
|
* @param $context ResourceLoaderContext
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2010-10-19 18:25:42 +00:00
|
|
|
public function getScript( ResourceLoaderContext $context ) {
|
2011-05-10 23:17:13 +00:00
|
|
|
global $IP, $wgLoadScript, $wgLegacyJavaScriptGlobals;
|
2010-10-19 18:25:42 +00:00
|
|
|
|
|
|
|
|
$out = file_get_contents( "$IP/resources/startup.js" );
|
|
|
|
|
if ( $context->getOnly() === 'scripts' ) {
|
2011-03-20 17:15:51 +00:00
|
|
|
|
|
|
|
|
// The core modules:
|
2012-04-14 10:41:49 +00:00
|
|
|
$moduleNames = array( 'jquery', 'mediawiki' );
|
|
|
|
|
wfRunHooks( 'ResourceLoaderGetStartupModules', array( &$moduleNames ) );
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2011-03-20 17:15:51 +00:00
|
|
|
// Get the latest version
|
2012-04-14 10:41:49 +00:00
|
|
|
$loader = $context->getResourceLoader();
|
2011-06-17 16:05:05 +00:00
|
|
|
$version = 0;
|
2012-04-14 10:41:49 +00:00
|
|
|
foreach ( $moduleNames as $moduleName ) {
|
2011-03-20 17:15:51 +00:00
|
|
|
$version = max( $version,
|
2012-04-14 10:41:49 +00:00
|
|
|
$loader->getModule( $moduleName )->getModifiedTime( $context )
|
2011-03-20 17:15:51 +00:00
|
|
|
);
|
|
|
|
|
}
|
2011-06-17 16:05:05 +00:00
|
|
|
// Build load query for StartupModules
|
2010-10-19 18:25:42 +00:00
|
|
|
$query = array(
|
2012-04-14 10:41:49 +00:00
|
|
|
'modules' => ResourceLoader::makePackedModulesString( $moduleNames ),
|
2010-10-19 18:25:42 +00:00
|
|
|
'only' => 'scripts',
|
|
|
|
|
'lang' => $context->getLanguage(),
|
|
|
|
|
'skin' => $context->getSkin(),
|
|
|
|
|
'debug' => $context->getDebug() ? 'true' : 'false',
|
2011-03-20 19:53:46 +00:00
|
|
|
'version' => wfTimestamp( TS_ISO_8601_BASIC, $version )
|
2010-10-19 18:25:42 +00:00
|
|
|
);
|
|
|
|
|
// Ensure uniform query order
|
|
|
|
|
ksort( $query );
|
2011-05-10 23:17:13 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
// Startup function
|
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness.
* Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object.
* In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array.
* Fixed MessageBlobStore to store {} for an empty message array instead of [].
* In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set.
* For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code.
* Documented several ResourceLoader static functions.
* In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements.
* In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it.
* wfGetDb -> wfGetDB
* Added an extra line break in the startup module output, for readability.
* In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
|
|
|
$configuration = $this->getConfig( $context );
|
2010-10-19 18:25:42 +00:00
|
|
|
$registrations = self::getModuleRegistrations( $context );
|
2012-04-14 10:41:49 +00:00
|
|
|
$registrations = str_replace( "\n", "\n\t", trim( $registrations ) ); // fix indentation
|
2011-05-10 23:17:13 +00:00
|
|
|
$out .= "var startUp = function() {\n" .
|
|
|
|
|
"\tmw.config = new " . Xml::encodeJsCall( 'mw.Map', array( $wgLegacyJavaScriptGlobals ) ) . "\n" .
|
|
|
|
|
"\t$registrations\n" .
|
|
|
|
|
"\t" . Xml::encodeJsCall( 'mw.config.set', array( $configuration ) ) .
|
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness.
* Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object.
* In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array.
* Fixed MessageBlobStore to store {} for an empty message array instead of [].
* In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set.
* For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code.
* Documented several ResourceLoader static functions.
* In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements.
* In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it.
* wfGetDb -> wfGetDB
* Added an extra line break in the startup module output, for readability.
* In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
|
|
|
"};\n";
|
2011-05-10 23:17:13 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
// Conditional script injection
|
* Introduced Xml::encodeJsCall(), to replace the awkward repetitive code that was doing the same thing throughout the resource loader with varying degrees of security and correctness.
* Modified Xml::encodeJsVar() to allow it to pass through JS expressions without encoding, using a special object.
* In ResourceLoader::makeModuleResponse(), renamed $messages to $messagesBlob to make it clear that it's JSON-encoded, not an array.
* Fixed MessageBlobStore to store {} for an empty message array instead of [].
* In ResourceLoader::makeMessageSetScript(), fixed call to non-existent function mediaWiki.msg.set.
* For security, changed the calling convention of makeMessageSetScript() and makeLoaderImplementScript() to require explicit object construction of XmlJsCode() before interpreting their input as JS code.
* Documented several ResourceLoader static functions.
* In ResourceLoaderWikiModule, for readability, reduced the indenting level by flipping some if blocks and adding continue statements.
* In makeCustomLoaderScript(), allow non-numeric $version. The only caller I can find is already sending a non-numeric $version, presumably it was broken. Luckily there aren't any loader scripts in existence, I had to make one to test it.
* wfGetDb -> wfGetDB
* Added an extra line break in the startup module output, for readability.
* In ResourceLoaderStartUpModule::getModuleRegistrations(), fixed another assignment expression
2010-11-04 07:53:37 +00:00
|
|
|
$scriptTag = Html::linkedScript( $wgLoadScript . '?' . wfArrayToCGI( $query ) );
|
2011-05-10 23:17:13 +00:00
|
|
|
$out .= "if ( isCompatible() ) {\n" .
|
|
|
|
|
"\t" . Xml::encodeJsCall( 'document.write', array( $scriptTag ) ) .
|
|
|
|
|
"}\n" .
|
2010-11-03 07:58:03 +00:00
|
|
|
"delete isCompatible;";
|
2010-10-19 18:25:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $out;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-14 08:06:54 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
Fix the fixme on r88053: dependency handling was broken in debug mode in certain cases. More specifically, if A is a file module that depends on B, B is a wiki module that depends on C and C is a file module, the loading order is CBA (correct) in production mode but was BCA (wrong) in debug mode. Fixed this by URL-ifying scripts and styles for those modules in debug mode, as I said to on CR. What this means is that the initial debug=true request for a module will now always return arrays of URLs, never the JS or CSS itself. This was already the case for file modules (which returned arrays of URLs to the raw files), but not for other modules (which returned the JS and CSS itself). So for non-file modules, load.php?modules=foo&debug=true now returns some JS that instructs the loader to fetch the module's JS from load.php?modules=foo&debug=true&only=scripts and the CSS from ...&only=styles .
* Removed the magic behavior where ResourceLoaderModule::getScripts() and getStyles() could return an array of URLs where the documentation said they should return a JS/CSS string. Because I didn't restructure the calling code too much, the old magical behavior should still work.
* Instead, move this behavior to getScriptURLsForDebug() and getStyleURLsForDebug(). The default implementation constructs a single URL for a load.php request for the module with debug=true&only=scripts (or styles). The URL building code duplicates some things from OutputPage::makeResourceLoaderLink(), I'll clean that up later. ResourceLoaderFileModule overrides this method to return URLs to the raw files, using code that I removed from getScripts()/getStyles()
* Add ResourceLoaderModule::supportsURLLoading(), which returns true by default but may return false to indicate that a module does not support loading via a URL. This is needed to respect $this->debugRaw in ResourceLoaderFileModule (set to true for jquery and mediawiki), and obviously for the startup module as well, because we get bootstrapping problems otherwise (can't call mw.loader.implement() when the code for mw.loader isn't loaded yet)
2011-09-13 17:13:53 +00:00
|
|
|
public function supportsURLLoading() {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @param $context ResourceLoaderContext
|
|
|
|
|
* @return array|mixed
|
|
|
|
|
*/
|
2010-10-19 18:25:42 +00:00
|
|
|
public function getModifiedTime( ResourceLoaderContext $context ) {
|
|
|
|
|
global $IP, $wgCacheEpoch;
|
|
|
|
|
|
|
|
|
|
$hash = $context->getHash();
|
|
|
|
|
if ( isset( $this->modifiedTime[$hash] ) ) {
|
|
|
|
|
return $this->modifiedTime[$hash];
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-23 21:01:54 +00:00
|
|
|
// Call preloadModuleInfo() on ALL modules as we're about
|
|
|
|
|
// to call getModifiedTime() on all of them
|
|
|
|
|
$loader = $context->getResourceLoader();
|
|
|
|
|
$loader->preloadModuleInfo( $loader->getModuleNames(), $context );
|
|
|
|
|
|
|
|
|
|
$this->modifiedTime[$hash] = filemtime( "$IP/resources/startup.js" );
|
|
|
|
|
// ATTENTION!: Because of the line above, this is not going to cause
|
2011-06-17 16:05:05 +00:00
|
|
|
// infinite recursion - think carefully before making changes to this
|
2010-11-03 07:58:03 +00:00
|
|
|
// code!
|
2010-10-19 18:25:42 +00:00
|
|
|
$time = wfTimestamp( TS_UNIX, $wgCacheEpoch );
|
* Made Resources.php return a pure-data array instead of an ugly mix of data and code. This allows the class code to be lazy-loaded with the autoloader, for a performance advantage especially on non-APC installs. And using the convention where if the class is omitted, ResourceLoaderFileModule is assumed, the registration code becomes shorter and simpler.
* Modified ResourceLoader to lazy-initialise module objects, for a further performance advantage.
* Deleted ResourceLoader::getModules(), provided getModuleNames() instead. Although the startup module needs this functionality, it's slow to generate, so to avoid misuse, it's better to provide a foolproof fast interface and let the startup module do the slow thing itself.
* Modified ResourceLoader::register() to optionally accept an info array instead of an object.
* Added $wgResourceModules, allowing extensions to efficiently define their own resource loader modules. The trouble with hooks is that they contain code, and code is slow. We've been through all this before with i18n. Hooks are useful as a performance tool only if you call them very rarely.
* Moved ResourceLoader settings to their own section in DefaultSettings.php
* Added options to ResourceLoaderFileModule equivalent to the $localBasePath and $remoteBasePath parameters, to allow it to be instantiated via the new array style. Also added remoteExtPath, which allows modules to be registered before $wgExtensionAssetsPath is known.
* Added OutputPage::getResourceLoader(), mostly for debugging.
* The time saving at the moment is about 5ms per request with no extensions, which is significant already with 6 load.php requests for a cold cache page view. This is a much more scalable interface; the relative saving will grow as more extensions are added which use this interface, especially for non-APC installs.
Although the interface is backwards compatible, extension updates will follow in a subsequent commit.
2010-11-19 10:41:06 +00:00
|
|
|
foreach ( $loader->getModuleNames() as $name ) {
|
|
|
|
|
$module = $loader->getModule( $name );
|
2010-10-19 18:25:42 +00:00
|
|
|
$time = max( $time, $module->getModifiedTime( $context ) );
|
|
|
|
|
}
|
|
|
|
|
return $this->modifiedTime[$hash] = $time;
|
|
|
|
|
}
|
2011-05-21 17:45:20 +00:00
|
|
|
|
2010-10-19 18:25:42 +00:00
|
|
|
/* Methods */
|
2011-05-21 17:45:20 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2010-10-19 18:25:42 +00:00
|
|
|
public function getGroup() {
|
|
|
|
|
return 'startup';
|
|
|
|
|
}
|
2011-06-16 21:20:05 +00:00
|
|
|
}
|