2010-10-19 18:25:42 +00:00
|
|
|
<?php
|
|
|
|
|
/**
|
|
|
|
|
* 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,
|
2011-06-17 16:05:05 +00:00
|
|
|
$wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion,
|
2011-05-10 23:17:13 +00:00
|
|
|
$wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest,
|
2011-06-16 05:13:29 +00:00
|
|
|
$wgSitename, $wgFileExtensions, $wgExtensionAssetsPath,
|
2011-05-10 23:17:13 +00:00
|
|
|
$wgCookiePrefix, $wgResourceLoaderMaxQueryLength, $wgLegacyJavaScriptGlobals;
|
2010-10-19 18:25:42 +00:00
|
|
|
|
|
|
|
|
// Pre-process information
|
|
|
|
|
$separatorTransTable = $wgContLang->separatorTransformTable();
|
|
|
|
|
$separatorTransTable = $separatorTransTable ? $separatorTransTable : array();
|
|
|
|
|
$compactSeparatorTransTable = array(
|
|
|
|
|
implode( "\t", array_keys( $separatorTransTable ) ),
|
|
|
|
|
implode( "\t", $separatorTransTable ),
|
|
|
|
|
);
|
|
|
|
|
$digitTransTable = $wgContLang->digitTransformTable();
|
|
|
|
|
$digitTransTable = $digitTransTable ? $digitTransTable : array();
|
|
|
|
|
$compactDigitTransTable = array(
|
|
|
|
|
implode( "\t", array_keys( $digitTransTable ) ),
|
|
|
|
|
implode( "\t", $digitTransTable ),
|
|
|
|
|
);
|
|
|
|
|
$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,
|
|
|
|
|
'wgActionPaths' => $wgActionPaths,
|
|
|
|
|
'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,
|
Completely rewritten table sorting script.
Fixes Bug 8028, Bug 8115, Bug 15406, Bug 17141, Bug 8732
1. Sites can specify custom collations.
The script accepts an object "tableSorterCollation" which contains a lookup
table, how specific characters should be treated.
For example, after setting "tableSorterCollation={'ä':'ae', 'ß':'ss'};" in the
site's common.js any string containing an ä or Ä will be sorted as if it were a
'ae'.
2. Table rows can be forced to use a specific data type.
By setting class="sort-{Parsername}", the row will be parsed with the specified
algorithm. class="sort-date" would force date sorting etc.
The following parsers are available: text, IPAddress, number, url, currency,
date, isoDate, usLongDate, time
3. Execution time is reduced by half or more.
Sorting a 935 row * 8 columns table:
Browser Before After
-------- ------ -----
Chrome 10 90ms 42ms
Safari 5 115ms 48ms
Firefox 4 412ms 87ms
IE8 720ms 115ms
4. Based on the content language and the mdy vs dmy preference, the parser can
understand dates such as "17. März '11". wgMonthNames=[] and
wgMonthNamesShort=[]
in the content language and the mdy vs dmy preference are exported to js; A
table containing the following dates would be sorted correctly:
17. Jan. 01
23 Feb 1992
9.02.05
13 November 2001
14 Oktober '76
Was tested in ie6-8, chrome, safari 5, ff3 & ff4
2011-04-14 21:47:00 +00:00
|
|
|
'wgDefaultDateFormat' => $wgContLang->getDefaultDateFormat(),
|
2011-04-18 12:54:28 +00:00
|
|
|
'wgMonthNames' => $wgContLang->getMonthNamesArray(),
|
|
|
|
|
'wgMonthNamesShort' => $wgContLang->getMonthAbbreviationsArray(),
|
2010-10-19 18:25:42 +00:00
|
|
|
'wgSeparatorTransformTable' => $compactSeparatorTransTable,
|
|
|
|
|
'wgDigitTransformTable' => $compactDigitTransTable,
|
|
|
|
|
'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
|
|
|
|
|
'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-05-10 23:17:13 +00:00
|
|
|
'wgLegacyJavaScriptGlobals' => $wgLegacyJavaScriptGlobals,
|
2011-06-16 21:20:05 +00:00
|
|
|
'wgCaseSensitiveNamespaces' => $caseSensitiveNamespaces,
|
2010-10-19 18:25:42 +00:00
|
|
|
);
|
|
|
|
|
if ( $wgUseAjax && $wgEnableMWSuggest ) {
|
|
|
|
|
$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
|
|
|
|
|
}
|
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();
|
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 );
|
2010-10-19 18:25:42 +00:00
|
|
|
// Support module loader scripts
|
* 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
|
|
|
$loader = $module->getLoaderScript();
|
|
|
|
|
if ( $loader !== false ) {
|
2010-10-19 18:25:42 +00:00
|
|
|
$deps = $module->getDependencies();
|
|
|
|
|
$group = $module->getGroup();
|
2011-07-26 21:10:34 +00:00
|
|
|
$source = $module->getSource();
|
2011-06-17 16:05:05 +00:00
|
|
|
$version = wfTimestamp( TS_ISO_8601_BASIC,
|
2011-03-20 17:08:38 +00:00
|
|
|
$module->getModifiedTime( $context ) );
|
2011-07-26 21:10:34 +00:00
|
|
|
$out .= ResourceLoader::makeCustomLoaderScript( $name, $version, $deps, $group, $source, $loader );
|
2010-10-19 18:25:42 +00:00
|
|
|
}
|
|
|
|
|
// Automatically register module
|
|
|
|
|
else {
|
2011-01-13 14:42:19 +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 ) );
|
2011-07-26 21:10:34 +00:00
|
|
|
// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
|
2011-02-19 22:59:44 +00:00
|
|
|
// mw.loader.register()
|
2011-07-26 21:10:34 +00:00
|
|
|
if ( !count( $module->getDependencies() && $module->getGroup() === null && $module->getSource() === 'local' ) ) {
|
2010-10-19 18:25:42 +00:00
|
|
|
$registrations[] = array( $name, $mtime );
|
|
|
|
|
}
|
2011-07-26 21:10:34 +00:00
|
|
|
// Modules with dependencies but no group or foreign source pass three arguments
|
2011-02-19 22:59:44 +00:00
|
|
|
// (name, timestamp, dependencies) to mw.loader.register()
|
2011-07-26 21:10:34 +00:00
|
|
|
elseif ( $module->getGroup() === null && $module->getSource() === 'local' ) {
|
2010-10-19 18:25:42 +00:00
|
|
|
$registrations[] = array(
|
|
|
|
|
$name, $mtime, $module->getDependencies() );
|
|
|
|
|
}
|
2011-07-26 21:10:34 +00:00
|
|
|
// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
|
2011-02-19 22:59:44 +00:00
|
|
|
// to mw.loader.register()
|
2011-07-26 21:10:34 +00:00
|
|
|
else if ( $module->getSource() === 'local' ) {
|
2010-10-19 18:25:42 +00:00
|
|
|
$registrations[] = array(
|
|
|
|
|
$name, $mtime, $module->getDependencies(), $module->getGroup() );
|
|
|
|
|
}
|
2011-07-26 21:10:34 +00:00
|
|
|
// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
|
|
|
|
|
// to mw.loader.register()
|
|
|
|
|
else {
|
|
|
|
|
$registrations[] = array(
|
|
|
|
|
$name, $mtime, $module->getDependencies(), $module->getGroup(), $module->getSource() );
|
|
|
|
|
}
|
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
|
|
|
/**
|
|
|
|
|
* @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:
|
|
|
|
|
$modules = array( 'jquery', 'mediawiki' );
|
|
|
|
|
wfRunHooks( 'ResourceLoaderGetStartupModules', array( &$modules ) );
|
2011-06-17 16:05:05 +00:00
|
|
|
|
2011-03-20 17:15:51 +00:00
|
|
|
// Get the latest version
|
2011-06-17 16:05:05 +00:00
|
|
|
$version = 0;
|
2011-03-20 17:15:51 +00:00
|
|
|
foreach ( $modules as $moduleName ) {
|
|
|
|
|
$version = max( $version,
|
|
|
|
|
$context->getResourceLoader()->getModule( $moduleName )->getModifiedTime( $context )
|
|
|
|
|
);
|
|
|
|
|
}
|
2011-06-17 16:05:05 +00:00
|
|
|
// Build load query for StartupModules
|
2010-10-19 18:25:42 +00:00
|
|
|
$query = array(
|
2011-06-01 13:51:50 +00:00
|
|
|
'modules' => ResourceLoader::makePackedModulesString( $modules ),
|
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 );
|
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
|
|
|
}
|