Reorder some modules in Resources.php to match directory tree and alphabetical sorting.

diff --git a/resources/Resources.php b/resources/Resources.php
index 03a3d70..f5c1ba7 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2,7 +2,7 @@
 
 return array(
 
-       /* Special resources who have their own classes */
+       /* Special modules who have their own classes */
 
        'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
        'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
@@ -64,7 +64,7 @@ return array(
 
        'jquery' => array(
                'scripts' => 'resources/jquery/jquery.js',
-               'debugRaw' => false
+               'debugRaw' => false,
        ),
 
        /* jQuery Plugins */
@@ -164,6 +164,9 @@ return array(
        'jquery.textSelection' => array(
                'scripts' => 'resources/jquery/jquery.textSelection.js',
        ),
+
+       /* jQuery Tipsy */
+
        'jquery.tipsy' => array(
                'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
                'styles' => 'resources/jquery.tipsy/jquery.tipsy.css',
@@ -457,21 +460,109 @@ return array(
                        'jquery.cookie',
                ),
        ),
-       'mediawiki.page.startup' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js',
+
+       /* MediaWiki Action */
+
+       'mediawiki.action.edit' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
-                       'jquery.client',
+                       'jquery.textSelection',
+                       'jquery.byteLimit',
                ),
-               'position' => 'top',
        ),
-       'mediawiki.page.ready' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
-               'dependencies' => array(
-                       'jquery.checkboxShiftClick',
-                       'jquery.makeCollapsible',
-                       'jquery.placeholder',
+       'mediawiki.action.history' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
+               'dependencies' => 'jquery.ui.button',
+               'group' => 'mediawiki.action.history',
+       ),
+       'mediawiki.action.history.diff' => array(
+               'styles' => 'resources/mediawiki.action/mediawiki.action.history.diff.css',
+               'group' => 'mediawiki.action.history',
+       ),
+       'mediawiki.action.view.metadata' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
+               'messages' => array(
+                       'metadata-expand',
+                       'metadata-collapse',
+               ),
+       ),
+       'mediawiki.action.view.rightClickEdit' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
+       ),
+       'mediawiki.action.watch.ajax' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
+               'messages' => array(
+                       'watch',
+                       'unwatch',
+                       'watching',
+                       'unwatching',
+                       'tooltip-ca-watch',
+                       'tooltip-ca-unwatch',
+                       'watcherrortext',
+               ),
+       ),
+
+       /* MediaWiki Language */
+
+       'mediawiki.language' => array(
+               'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
+               'languageScripts' => array(
+                       'am' => 'resources/mediawiki.language/languages/am.js',
+                       'ar' => 'resources/mediawiki.language/languages/ar.js',
+                       'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js',
+                       'be' => 'resources/mediawiki.language/languages/be.js',
+                       'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js',
+                       'bh' => 'resources/mediawiki.language/languages/bh.js',
+                       'bs' => 'resources/mediawiki.language/languages/bs.js',
+                       'cs' => 'resources/mediawiki.language/languages/cs.js',
+                       'cu' => 'resources/mediawiki.language/languages/cu.js',
+                       'cy' => 'resources/mediawiki.language/languages/cy.js',
+                       'dsb' => 'resources/mediawiki.language/languages/dsb.js',
+                       'fr' => 'resources/mediawiki.language/languages/fr.js',
+                       'ga' => 'resources/mediawiki.language/languages/ga.js',
+                       'gd' => 'resources/mediawiki.language/languages/gd.js',
+                       'gv' => 'resources/mediawiki.language/languages/gv.js',
+                       'he' => 'resources/mediawiki.language/languages/he.js',
+                       'hi' => 'resources/mediawiki.language/languages/hi.js',
+                       'hr' => 'resources/mediawiki.language/languages/hr.js',
+                       'hsb' => 'resources/mediawiki.language/languages/hsb.js',
+                       'hy' => 'resources/mediawiki.language/languages/hy.js',
+                       'ksh' => 'resources/mediawiki.language/languages/ksh.js',
+                       'ln' => 'resources/mediawiki.language/languages/ln.js',
+                       'lt' => 'resources/mediawiki.language/languages/lt.js',
+                       'lv' => 'resources/mediawiki.language/languages/lv.js',
+                       'mg' => 'resources/mediawiki.language/languages/mg.js',
+                       'mk' => 'resources/mediawiki.language/languages/mk.js',
+                       'mo' => 'resources/mediawiki.language/languages/mo.js',
+                       'mt' => 'resources/mediawiki.language/languages/mt.js',
+                       'nso' => 'resources/mediawiki.language/languages/nso.js',
+                       'pl' => 'resources/mediawiki.language/languages/pl.js',
+                       'pt-br' => 'resources/mediawiki.language/languages/pt-br.js',
+                       'ro' => 'resources/mediawiki.language/languages/ro.js',
+                       'ru' => 'resources/mediawiki.language/languages/ru.js',
+                       'se' => 'resources/mediawiki.language/languages/se.js',
+                       'sh' => 'resources/mediawiki.language/languages/sh.js',
+                       'sk' => 'resources/mediawiki.language/languages/sk.js',
+                       'sl' => 'resources/mediawiki.language/languages/sl.js',
+                       'sma' => 'resources/mediawiki.language/languages/sma.js',
+                       'sr-ec' => 'resources/mediawiki.language/languages/sr-ec.js',
+                       'sr-el' => 'resources/mediawiki.language/languages/sr-el.js',
+                       'sr' => 'resources/mediawiki.language/languages/sr.js',
+                       'ti' => 'resources/mediawiki.language/languages/ti.js',
+                       'tl' => 'resources/mediawiki.language/languages/tl.js',
+                       'uk' => 'resources/mediawiki.language/languages/uk.js',
+                       'wa' => 'resources/mediawiki.language/languages/wa.js',
                ),
        ),
+
+       /* MediaWiki Libs */
+
+       'mediawiki.libs.jpegmeta' => array(
+               'scripts' => 'resources/mediawiki.libs/mediawiki.libs.jpegmeta.js',
+       ),
+
+       /* MediaWiki Page */
+
        'mediawiki.util' => array(
                'scripts' => 'resources/mediawiki/mediawiki.util.js',
                'dependencies' => array(
@@ -481,12 +572,6 @@ return array(
                        'jquery.mwPrototypes',
                ),
        ),
-       'mediawiki.page.mwsuggest' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.mwsuggest.js',
-               'dependencies' => array( 
-                       'jquery.ui.autocomplete',
-               ),
-       ),
        'mediawiki.page.ajaxCategories' => array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.ajaxCategories.js',
                'styles' => 'resources/mediawiki.page/mediawiki.page.ajaxCategories.css',
@@ -525,46 +610,30 @@ return array(
                        'mediawiki.page.ajaxCategories',
                ),
        ),
-       'mediawiki.libs.jpegmeta' => array(
-               'scripts' => 'resources/mediawiki.libs/mediawiki.libs.jpegmeta.js',
-       ),
-       'mediawiki.action.history' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
-               'dependencies' => 'jquery.ui.button',
-               'group' => 'mediawiki.action.history',
-       ),
-       'mediawiki.action.history.diff' => array(
-               'styles' => 'resources/mediawiki.action/mediawiki.action.history.diff.css',
-               'group' => 'mediawiki.action.history',
+       'mediawiki.page.mwsuggest' => array(
+               'scripts' => 'resources/mediawiki.page/mediawiki.page.mwsuggest.js',
+               'dependencies' => array( 
+                       'jquery.ui.autocomplete',
+               ),
        ),
-       'mediawiki.action.edit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
+       'mediawiki.page.ready' => array(
+               'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
-                       'jquery.textSelection',
-                       'jquery.byteLimit',
+                       'jquery.checkboxShiftClick',
+                       'jquery.makeCollapsible',
+                       'jquery.placeholder',
                ),
        ),
-       'mediawiki.action.view.rightClickEdit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
-       ),
-       'mediawiki.action.view.metadata' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
-               'messages' => array( 'metadata-expand', 'metadata-collapse' ),
-       ),
-       'mediawiki.action.watch.ajax' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
-               'messages' => array(
-                       'watch',
-                       'unwatch',
-                       'watching',
-                       'unwatching',
-                       'tooltip-ca-watch',
-                       'tooltip-ca-unwatch',
-                       'watcherrortext',
+       'mediawiki.page.startup' => array(
+               'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js',
+               'dependencies' => array(
+                       'jquery.client',
                ),
+               'position' => 'top',
        ),
+       
 
-       /* Special pages */
+       /* MediaWiki Special pages */
 
        'mediawiki.special' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.js',
@@ -612,58 +681,7 @@ return array(
                'dependencies' => array( 'mediawiki.libs.jpegmeta' ),
        ),
 
-       'mediawiki.language' => array(
-               'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
-               'languageScripts' => array(
-                       'am' => 'resources/mediawiki.language/languages/am.js',
-                       'ar' => 'resources/mediawiki.language/languages/ar.js',
-                       'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js',
-                       'be' => 'resources/mediawiki.language/languages/be.js',
-                       'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js',
-                       'bh' => 'resources/mediawiki.language/languages/bh.js',
-                       'bs' => 'resources/mediawiki.language/languages/bs.js',
-                       'cs' => 'resources/mediawiki.language/languages/cs.js',
-                       'cu' => 'resources/mediawiki.language/languages/cu.js',
-                       'cy' => 'resources/mediawiki.language/languages/cy.js',
-                       'dsb' => 'resources/mediawiki.language/languages/dsb.js',
-                       'fr' => 'resources/mediawiki.language/languages/fr.js',
-                       'ga' => 'resources/mediawiki.language/languages/ga.js',
-                       'gd' => 'resources/mediawiki.language/languages/gd.js',
-                       'gv' => 'resources/mediawiki.language/languages/gv.js',
-                       'he' => 'resources/mediawiki.language/languages/he.js',
-                       'hi' => 'resources/mediawiki.language/languages/hi.js',
-                       'hr' => 'resources/mediawiki.language/languages/hr.js',
-                       'hsb' => 'resources/mediawiki.language/languages/hsb.js',
-                       'hy' => 'resources/mediawiki.language/languages/hy.js',
-                       'ksh' => 'resources/mediawiki.language/languages/ksh.js',
-                       'ln' => 'resources/mediawiki.language/languages/ln.js',
-                       'lt' => 'resources/mediawiki.language/languages/lt.js',
-                       'lv' => 'resources/mediawiki.language/languages/lv.js',
-                       'mg' => 'resources/mediawiki.language/languages/mg.js',
-                       'mk' => 'resources/mediawiki.language/languages/mk.js',
-                       'mo' => 'resources/mediawiki.language/languages/mo.js',
-                       'mt' => 'resources/mediawiki.language/languages/mt.js',
-                       'nso' => 'resources/mediawiki.language/languages/nso.js',
-                       'pl' => 'resources/mediawiki.language/languages/pl.js',
-                       'pt-br' => 'resources/mediawiki.language/languages/pt-br.js',
-                       'ro' => 'resources/mediawiki.language/languages/ro.js',
-                       'ru' => 'resources/mediawiki.language/languages/ru.js',
-                       'se' => 'resources/mediawiki.language/languages/se.js',
-                       'sh' => 'resources/mediawiki.language/languages/sh.js',
-                       'sk' => 'resources/mediawiki.language/languages/sk.js',
-                       'sl' => 'resources/mediawiki.language/languages/sl.js',
-                       'sma' => 'resources/mediawiki.language/languages/sma.js',
-                       'sr-ec' => 'resources/mediawiki.language/languages/sr-ec.js',
-                       'sr-el' => 'resources/mediawiki.language/languages/sr-el.js',
-                       'sr' => 'resources/mediawiki.language/languages/sr.js',
-                       'ti' => 'resources/mediawiki.language/languages/ti.js',
-                       'tl' => 'resources/mediawiki.language/languages/tl.js',
-                       'uk' => 'resources/mediawiki.language/languages/uk.js',
-                       'wa' => 'resources/mediawiki.language/languages/wa.js',
-               ),
-       ),
-
-       /* mediawiki Legacy */
+       /* MediaWiki Legacy */
 
        'mediawiki.legacy.ajax' => array(
                'scripts' => 'common/ajax.js',