* Re-order special modules and add a few comments
* Single quote in QUnitTestResources.php
* Space in ResourceLoader.php
(Separated from another commit while skimming code)
* @return string
*/
public static function makeLoaderConditionalScript( $script ) {
* @return string
*/
public static function makeLoaderConditionalScript( $script ) {
- return "if(window.mw){\n".trim( $script )."\n}";
+ return "if(window.mw){\n" . trim( $script ) . "\n}";
/* Special modules who have their own classes */
/* Special modules who have their own classes */
+ // Scripts managed by the local wiki (stored in the MediaWiki namespace)
'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
- 'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+ 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
- 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+
+ // Scripts managed by the current user (stored in their user space)
+ 'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+
+ // Scripts generated based on the current user's preferences
'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
+
+ // Populate mediawiki.user placeholders with information about the current user
+ 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
- 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
'tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js',
'tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js',
'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',
'tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js',
'tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js',
'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',
- "tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js",
+ 'tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js',
),
'dependencies' => array(
'jquery.autoEllipsis',
),
'dependencies' => array(
'jquery.autoEllipsis',