Fix type, follow-up r81615

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 05265f0..d566ee8 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -8,8 +8,9 @@ return array(
        'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
        'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
        'user' => array( 'class' => 'ResourceLoaderUserModule' ),
-       'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
        'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
+       'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+       'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
 
        /* Skins */
 
@@ -132,6 +133,9 @@ return array(
                'styles' => 'resources/jquery/jquery.makeCollapsible.css',
                'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
        ),
+       'jquery.mwPrototypes' => array(
+               'scripts' => 'resources/jquery/jquery.mwPrototypes.js',
+       ),
        'jquery.qunit' => array(
                'scripts' => 'resources/jquery/jquery.qunit.js',
                'styles' => 'resources/jquery/jquery.qunit.css',
@@ -171,27 +175,33 @@ return array(
                        ),
                ),
                'dependencies' => 'jquery',
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.widget' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.widget.js',
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.mouse' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.mouse.js',
                'dependencies' => 'jquery.ui.widget',
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.position' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.position.js',
+               'group' => 'jquery.ui',
        ),
        // Interactions
        'jquery.ui.draggable' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.draggable.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget' ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.droppable' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
                'dependencies' => array(
                        'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.resizable' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.resizable.js',
@@ -200,6 +210,7 @@ return array(
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.resizable.css',
                ),
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.selectable' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.selectable.js',
@@ -208,10 +219,12 @@ return array(
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.selectable.css',
                ),
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.sortable' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.sortable.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+               'group' => 'jquery.ui',
        ),
        // Widgets
        'jquery.ui.accordion' => array(
@@ -221,6 +234,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.accordion.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.accordion.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.autocomplete' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.autocomplete.js',
@@ -229,6 +243,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.autocomplete.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.button' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.button.js',
@@ -237,6 +252,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.button.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.button.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.datepicker' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.datepicker.js',
@@ -299,6 +315,7 @@ return array(
                        'zh-hk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
                        'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.dialog' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.dialog.js',
@@ -315,6 +332,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.dialog.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.progressbar' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.progressbar.js',
@@ -323,6 +341,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.progressbar.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.slider' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.slider.js',
@@ -331,6 +350,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.slider.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.slider.css',
                ),
+               'group' => 'jquery.ui',
        ),
        'jquery.ui.tabs' => array(
                'scripts' => 'resources/jquery.ui/jquery.ui.tabs.js',
@@ -339,59 +359,73 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.tabs.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.tabs.css',
                ),
+               'group' => 'jquery.ui',
        ),
        // Effects
        'jquery.effects.core' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.core.js',
                'dependencies' => 'jquery',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.blind' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.blind.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.bounce' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.bounce.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.clip' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.clip.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.drop' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.drop.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.explode' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.explode.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.fold' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.fold.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.highlight' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.highlight.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.pulsate' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.pulsate.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.scale' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.scale.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.shake' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.shake.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.slide' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.slide.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
        'jquery.effects.transfer' => array(
                'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js',
                'dependencies' => 'jquery.effects.core',
+               'group' => 'jquery.ui',
        ),
 
        /* MediaWiki */
@@ -404,6 +438,12 @@ return array(
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
        ),
+       'mediawiki.user' => array(
+               'scripts' => 'resources/mediawiki/mediawiki.user.js',
+               'dependencies' => array(
+                       'jquery.cookie',
+               ),
+       ),
        'mediawiki.util' => array(
                'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
                'dependencies' => array(
@@ -412,10 +452,9 @@ return array(
                        'jquery.cookie',
                        'jquery.messageBox',
                        'jquery.makeCollapsible',
+                       'jquery.mwPrototypes',
                        'jquery.placeholder',
-                       'jquery.tablesorter',
                ),
-               'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
        ),
        'mediawiki.util.jpegmeta' => array(
                'scripts' => 'resources/mediawiki.util/mediawiki.util.jpegmeta.js',
@@ -439,9 +478,20 @@ return array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
                'messages' => array( 'metadata-expand', 'metadata-collapse' ),
        ),
+       'mediawiki.action.view.tablesorting' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.tablesorting.js',
+       ),
        'mediawiki.action.watch.ajax' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
-               'dependencies' => 'mediawiki.util',
+               'messages' => array(
+                       'watch',
+                       'unwatch',
+                       'watching',
+                       'unwatching',
+                       'tooltip-ca-watch',
+                       'tooltip-ca-unwatch',
+                       'watcherrortext',
+               ),
        ),
 
        /* Special pages */
@@ -539,14 +589,6 @@ return array(
                'scripts' => 'common/ajax.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => "{$GLOBALS['IP']}/skins",
-               'messages' => array(
-                       'watch',
-                       'unwatch',
-                       'watching',
-                       'unwatching',
-                       'tooltip-ca-watch',
-                       'tooltip-ca-unwatch',
-               ),
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.commonPrint' => array(
@@ -562,13 +604,10 @@ return array(
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.diff' => array(
-               'scripts' => 'common/diff.js',
                'styles' => 'common/diff.css',
                'group' => 'mediawiki.action.history',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => "{$GLOBALS['IP']}/skins",
-               'dependencies' => 'mediawiki.legacy.wikibits',
-               'position' => 'top',
        ),
        'mediawiki.legacy.edit' => array(
                'scripts' => 'common/edit.js',