Merge "Added Linker::getInvalidTitleDescription() to display invalid title entries...

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 8d73540..909cb6e 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -4,19 +4,30 @@ 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' ),
+
+       // 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' ),
+
+       // Scripts for the dynamic language specific data, like grammar forms.
+       'mediawiki.language.data' => array( 'class' => 'ResourceLoaderLanguageDataModule' ),
 
        /* Skins */
 
        'skins.chick' => array(
-               'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
+               'styles' => array( 'chick/main.css' => array( 'media' => 'screen, handheld' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
@@ -54,7 +65,7 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.standard' => array(
-               'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
+               'styles' => array( 'standard/main.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
@@ -64,6 +75,7 @@ return array(
                        'common/commonContent.css' => array( 'media' => 'screen' ),
                        'common/commonInterface.css' => array( 'media' => 'screen' ),
                        'vector/screen.css' => array( 'media' => 'screen' ),
+                       'vector/screen-hd.css' => array( 'media' => 'screen and (min-width: 900px)' ),
                ),
                'scripts' => 'vector/vector.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
@@ -82,6 +94,10 @@ return array(
        'jquery.appear' => array(
                'scripts' => 'resources/jquery/jquery.appear.js',
        ),
+       'jquery.arrowSteps' => array(
+               'scripts' => 'resources/jquery/jquery.arrowSteps.js',
+               'styles' => 'resources/jquery/jquery.arrowSteps.css',
+       ),
        'jquery.async' => array(
                'scripts' => 'resources/jquery/jquery.async.js',
        ),
@@ -127,6 +143,10 @@ return array(
                'styles' => 'resources/jquery/jquery.farbtastic.css',
                'dependencies' => 'jquery.colorUtil',
        ),
+       'jquery.footHovzer' => array(
+               'scripts' => 'resources/jquery/jquery.footHovzer.js',
+               'styles' => 'resources/jquery/jquery.footHovzer.css',
+       ),
        'jquery.form' => array(
                'scripts' => 'resources/jquery/jquery.form.js',
        ),
@@ -166,15 +186,15 @@ return array(
        'jquery.placeholder' => array(
                'scripts' => 'resources/jquery/jquery.placeholder.js',
        ),
-       'jquery.qunit.completenessTest' => array(
-               'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js',
-               'dependencies' => 'jquery.qunit',
-       ),
        'jquery.qunit' => array(
                'scripts' => 'resources/jquery/jquery.qunit.js',
                'styles' => 'resources/jquery/jquery.qunit.css',
                'position' => 'top',
        ),
+       'jquery.qunit.completenessTest' => array(
+               'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js',
+               'dependencies' => 'jquery.qunit',
+       ),
        'jquery.spinner' => array(
                'scripts' => 'resources/jquery/jquery.spinner.js',
                'styles' => 'resources/jquery/jquery.spinner.css',
@@ -194,6 +214,7 @@ return array(
        ),
        'jquery.textSelection' => array(
                'scripts' => 'resources/jquery/jquery.textSelection.js',
+               'dependencies' => 'jquery.client',
        ),
        'jquery.validate' => array(
                'scripts' => 'resources/jquery/jquery.validate.js',
@@ -334,6 +355,7 @@ return array(
                        'fr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fr.js',
                        'gl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-gl.js',
                        'he' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-he.js',
+                       'hi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hi.js',
                        'hr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hr.js',
                        'hu' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hu.js',
                        'hy' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hy.js',
@@ -342,6 +364,7 @@ return array(
                        'it' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-it.js',
                        'ja' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ja.js',
                        'kk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js',
+                       'km' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-km.js',
                        'ko' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ko.js',
                        'lb' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js',
                        'lt' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lt.js',
@@ -498,44 +521,57 @@ return array(
                'debugRaw' => false,
        ),
        'mediawiki.api' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.api.js',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
                'dependencies' => 'mediawiki.util',
        ),
        'mediawiki.api.category' => array( 
-               'scripts' => 'resources/mediawiki/mediawiki.api.category.js',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js',
                'dependencies' => array( 
                        'mediawiki.api',
                        'mediawiki.Title' 
                ),
        ),
        'mediawiki.api.edit' => array( 
-               'scripts' => 'resources/mediawiki/mediawiki.api.edit.js',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js',
                'dependencies' => array( 
                        'mediawiki.api',
                        'mediawiki.Title' 
                ),
        ),
        'mediawiki.api.parse' => array( 
-               'scripts' => 'resources/mediawiki/mediawiki.api.parse.js',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
                'dependencies' => 'mediawiki.api',
        ),
        'mediawiki.api.titleblacklist' => array( 
-               'scripts' => 'resources/mediawiki/mediawiki.api.titleblacklist.js',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.titleblacklist.js',
                'dependencies' => array( 
                        'mediawiki.api',
                        'mediawiki.Title' 
                ),
        ),
        'mediawiki.api.watch' => array( 
-               'scripts' => 'resources/mediawiki/mediawiki.api.watch.js',
-               'dependencies' => 'mediawiki.api',
+               'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js',
+               'dependencies' => array(
+                       'mediawiki.api',
+                       'user.tokens',
+               ),
        ),
        'mediawiki.debug' => array(
                'scripts' => 'resources/mediawiki/mediawiki.debug.js',
                'styles' => 'resources/mediawiki/mediawiki.debug.css',
+               'dependencies' => 'jquery.footHovzer',
+               'position' => 'bottom',
+       ),
+       'mediawiki.debug.init' => array(
+               'scripts' => 'resources/mediawiki/mediawiki.debug.init.js',
+               'dependencies' => 'mediawiki.debug',
+               // Uses a custom mw.config variable that is set in debughtml,
+               // must be loaded on the bottom
+               'position' => 'bottom',
        ),
        'mediawiki.feedback' => array(
                'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
+               'styles' => 'resources/mediawiki/mediawiki.feedback.css',
                'dependencies' => array( 
                        'mediawiki.api.edit', 
                        'mediawiki.Title',
@@ -582,6 +618,8 @@ return array(
                        'jquery.messageBox',
                        'jquery.mwExtension',
                ),
+               'messages' => array( 'showtoc', 'hidetoc' ),
+               'position' => 'top', // For $wgPreloadJavaScriptMwUtil
        ),
 
        /* MediaWiki Action */
@@ -618,7 +656,10 @@ return array(
        ),
        'mediawiki.action.watch.ajax' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
-               'dependencies' => 'mediawiki.api.watch',
+               'dependencies' => array(
+                       'mediawiki.api.watch',
+                       'mediawiki.util',
+               ),
                'messages' => array(
                        'watch',
                        'unwatch',
@@ -712,6 +753,7 @@ return array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js',
                'dependencies' => array(
                        'jquery.client',
+                       'mediawiki.util',
                ),
                'position' => 'top',
        ),
@@ -725,11 +767,20 @@ return array(
        ),
        'mediawiki.special.block' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
+               'dependencies' => array(
+                       'mediawiki.util',
+               ),
        ),
        'mediawiki.special.changeemail' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.changeemail.js',
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeemail.css',
-               'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),
+               'dependencies' => array(
+                       'mediawiki.util',
+               ),
+               'messages' => array(
+                       'email-address-validity-valid',
+                       'email-address-validity-invalid',
+               ),
        ),
        'mediawiki.special.changeslist' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
@@ -741,6 +792,7 @@ return array(
        ),
        'mediawiki.special.preferences' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
+               'styles'  => 'resources/mediawiki.special/mediawiki.special.preferences.css',
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
@@ -767,6 +819,28 @@ return array(
                ),
                'dependencies' => array( 'mediawiki.libs.jpegmeta', 'mediawiki.util' ),
        ),
+       'mediawiki.special.javaScriptTest' => array(
+               'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js',
+               'messages' => array_merge( Skin::getSkinNameMessages(), array(
+                       'colon-separator',
+                       'javascripttest-pagetext-skins',
+               ) ),
+               'dependencies' => array( 'jquery.qunit' ),
+               'position' => 'top',
+       ),
+
+       /* MediaWiki Tests */
+
+       'mediawiki.tests.qunit.testrunner' => array(
+               'scripts' => 'tests/qunit/data/testrunner.js',
+               'dependencies' => array(
+                       'jquery.qunit',
+                       'jquery.qunit.completenessTest',
+                       'mediawiki.page.startup',
+                       'mediawiki.page.ready',
+               ),
+               'position' => 'top',
+       ),
 
        /* MediaWiki Legacy */
 
@@ -774,7 +848,11 @@ return array(
                'scripts' => 'common/ajax.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => array( 'mediawiki.util', 'mediawiki.legacy.wikibits' ),
+               'dependencies' => array(
+                       'mediawiki.util',
+                       'mediawiki.legacy.wikibits',
+               ),
+               'position' => 'top', // Temporary hack for legacy support
        ),
        'mediawiki.legacy.commonPrint' => array(
                'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
@@ -815,6 +893,7 @@ return array(
                        'mediawiki.legacy.wikibits',
                        'jquery.byteLimit',
                ),
+               'position' => 'top',
        ),
        'mediawiki.legacy.shared' => array(
                'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
@@ -830,15 +909,19 @@ return array(
                'scripts' => 'common/upload.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => 'mediawiki.legacy.wikibits',
+               'dependencies' => array(
+                       'mediawiki.legacy.wikibits',
+                       'mediawiki.util',
+               ),
        ),
        'mediawiki.legacy.wikibits' => array(
                'scripts' => 'common/wikibits.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => 'mediawiki.language',
-               'messages' => array( 'showtoc', 'hidetoc' ),
-               'position' => 'bottom',
+               'dependencies' => array(
+                       'mediawiki.util',
+               ),
+               'position' => 'top',
        ),
        'mediawiki.legacy.wikiprintable' => array(
                'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),