[ResourceLoader] Minor clean up

* 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)

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 578c709..ffb418a 100644 (file)
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -980,7 +980,7 @@ class ResourceLoader {
         * @return string
         */
        public static function makeLoaderConditionalScript( $script ) {
-               return "if(window.mw){\n".trim( $script )."\n}";
+               return "if(window.mw){\n" . trim( $script ) . "\n}";
        }
 
        /**

diff --git a/resources/Resources.php b/resources/Resources.php
index 6d2438e..6529405 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -4,15 +4,22 @@ return array(
 
        /* 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' ),
-       'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+       'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
        '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' ),
+
+       // Populate mediawiki.user placeholders with information about the current user
+       'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
        'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
-       'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
 
        /* Skins */
 

diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index 670e3d1..9f2cf8e 100644 (file)
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -25,7 +25,7 @@ return array(
                        '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',