(bug 26716, well partially anyways. kind of second half of r80608) Add a comment...

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

diff --git a/resources/Resources.php b/resources/Resources.php
index c1c0979..652b5bf 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -12,14 +12,14 @@ return array(
        /* Skins */
 
        'skins.vector' => array(
-               'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) )
+               'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) ),
        ),
        'skins.monobook' => array(
                'styles' => array(
                        'skins/monobook/main.css' => array( 'media' => 'screen' ),
                        // Honor $wgHandheldStyle. This is kind of evil
-                       //$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' )
-               )
+                       //$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' ),
+               ),
        ),
 
        /* jQuery */
@@ -32,50 +32,66 @@ return array(
        /* jQuery Plugins */
 
        'jquery.async' => array(
-               'scripts' => 'resources/jquery/jquery.async.js'
+               'scripts' => 'resources/jquery/jquery.async.js',
        ),
        'jquery.autoEllipsis' => array(
-               'scripts' => 'resources/jquery/jquery.autoEllipsis.js'
+               'scripts' => 'resources/jquery/jquery.autoEllipsis.js',
+               'dependencies' => 'jquery.highlightText',
        ),
        'jquery.checkboxShiftClick' => array(
-               'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js'
+               'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js',
        ),
        'jquery.client' => array(
                'scripts' => 'resources/jquery/jquery.client.js',
        ),
        'jquery.collapsibleTabs' => array(
-               'scripts' => 'resources/jquery/jquery.collapsibleTabs.js'
+               'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
+       ),
+       'jquery.colorUtil' => array(
+               'scripts' => 'resources/jquery/jquery.colorUtil.js',
        ),
        'jquery.color' => array(
-               'scripts' => 'resources/jquery/jquery.color.js'
+               'scripts' => 'resources/jquery/jquery.color.js',
+               'dependencies' => 'jquery.colorUtil',
        ),
        'jquery.cookie' => array(
-               'scripts' => 'resources/jquery/jquery.cookie.js'
+               'scripts' => 'resources/jquery/jquery.cookie.js',
        ),
        'jquery.delayedBind' => array(
-               'scripts' => 'resources/jquery/jquery.delayedBind.js'
+               'scripts' => 'resources/jquery/jquery.delayedBind.js',
        ),
        'jquery.expandableField' => array(
-               'scripts' => 'resources/jquery/jquery.expandableField.js'
+               'scripts' => 'resources/jquery/jquery.expandableField.js',
+       ),
+       'jquery.form' => array(
+               'scripts' => 'resources/jquery/jquery.form.js',
        ),
        'jquery.highlightText' => array(
-               'scripts' => 'resources/jquery/jquery.highlightText.js'
+               'scripts' => 'resources/jquery/jquery.highlightText.js',
+       ),
+       'jquery.hoverIntent' => array(
+               'scripts' => 'resources/jquery/jquery.hoverIntent.js',
        ),
        'jquery.placeholder' => array(
-               'scripts' => 'resources/jquery/jquery.placeholder.js'
+               'scripts' => 'resources/jquery/jquery.placeholder.js',
        ),
        'jquery.localize' => array(
-               'scripts' => 'resources/jquery/jquery.localize.js'
+               'scripts' => 'resources/jquery/jquery.localize.js',
+       ),
+       'jquery.makeCollapsible' => array(
+               'scripts' => 'resources/jquery/jquery.makeCollapsible.js',
+               'styles' => 'resources/jquery/jquery.makeCollapsible.css',
+               'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
        ),
        'jquery.suggestions' => array(
                'scripts' => 'resources/jquery/jquery.suggestions.js',
                'styles' => 'resources/jquery/jquery.suggestions.css',
        ),
        'jquery.tabIndex' => array(
-               'scripts' => 'resources/jquery/jquery.tabIndex.js'
+               'scripts' => 'resources/jquery/jquery.tabIndex.js',
        ),
        'jquery.textSelection' => array(
-               'scripts' => 'resources/jquery/jquery.textSelection.js'
+               'scripts' => 'resources/jquery/jquery.textSelection.js',
        ),
        'jquery.tipsy' => array(
                'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
@@ -117,7 +133,7 @@ return array(
        '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'
+                       'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable',
                ),
        ),
        'jquery.ui.resizable' => array(
@@ -224,7 +240,7 @@ return array(
                        'vi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-vi.js',
                        'zh-cn' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-CN.js',
                        'zh-hk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
-                       'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js'
+                       'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
                ),
        ),
        'jquery.ui.dialog' => array(
@@ -326,32 +342,44 @@ return array(
        'mediawiki' => array(
                'scripts' => 'resources/mediawiki/mediawiki.js',
                'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
-               'dependencies' => array( 'jquery.cookie' ),
                'debugRaw' => false
        ),
        'mediawiki.util' => array(
                'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
-               'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.placeholder' ),
+               'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.cookie', 'jquery.placeholder', 'jquery.makeCollapsible' ),
                'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
        ),
        'mediawiki.action.history' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
                'dependencies' => 'mediawiki.legacy.history',
        ),
+       'mediawiki.action.edit' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
+       ),
        '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',
-               'dependencies' => array( 'mediawiki.util', 'mediawiki.legacy.ajax' ),
+               'dependencies' => 'mediawiki.util',
        ),
        'mediawiki.special.preferences' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
                'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
+               'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),
+       ),
+       'mediawiki.special.changeslist' => array(
+               'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
+               'dependencies' => array( 'jquery.makeCollapsible' ),
        ),
        'mediawiki.special.search' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
        ),
+       'mediawiki.special.upload' => array(
+               // @todo: merge in remainder of mediawiki.legacy.upload
+               'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
+               'messages' => array( 'widthheight', 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ),
+       ),
        'mediawiki.language' => array(
                'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
                'languageScripts' => array(
@@ -408,8 +436,7 @@ return array(
        'mediawiki.legacy.ajax' => array(
                'scripts' => 'skins/common/ajax.js',
                'messages' => array(
-                       'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch',
-                       'tooltip-ca-unwatch'
+                       'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', 'tooltip-ca-unwatch',
                ),
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
@@ -417,10 +444,6 @@ return array(
                'scripts' => 'skins/common/block.js',
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
-       'mediawiki.legacy.changepassword' => array(
-               'scripts' => 'skins/common/changepassword.js',
-               'dependencies' => 'mediawiki.legacy.wikibits',
-       ),
        'mediawiki.legacy.commonPrint' => array(
                'styles' => array( 'skins/common/commonPrint.css' => array( 'media' => 'print' ) ),
        ),
@@ -438,10 +461,6 @@ return array(
                'scripts' => 'skins/common/edit.js',
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
-       'mediawiki.legacy.enhancedchanges' => array(
-               'scripts' => 'skins/common/enhancedchanges.js',
-               'dependencies' => 'mediawiki.legacy.wikibits',
-       ),
        'mediawiki.legacy.history' => array(
                'scripts' => 'skins/common/history.js',
                'dependencies' => 'mediawiki.legacy.wikibits',
@@ -461,7 +480,7 @@ return array(
        ),
        'mediawiki.legacy.mwsuggest' => array(
                'scripts' => 'skins/common/mwsuggest.js',
-               'dependencies' => 'mediawiki.legacy.wikibits',
+               'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
                'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
        ),
        'mediawiki.legacy.password' => array(