Big oops - merged to wrong branch.

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 909cb6e..3b26a00 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -70,12 +70,13 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.vector' => array(
+               // Keep in sync with WebInstallerOutput::getCSS()
                'styles' => array(
                        'common/commonElements.css' => array( 'media' => 'screen' ),
                        '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)' ),
+                       'vector/screen-hd.css' => array( 'media' => 'screen and (min-width: 982px)' ),
                ),
                'scripts' => 'vector/vector.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
@@ -524,32 +525,32 @@ return array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
                'dependencies' => 'mediawiki.util',
        ),
-       'mediawiki.api.category' => array( 
+       'mediawiki.api.category' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js',
-               'dependencies' => array( 
+               'dependencies' => array(
                        'mediawiki.api',
-                       'mediawiki.Title' 
+                       'mediawiki.Title',
                ),
        ),
-       'mediawiki.api.edit' => array( 
+       'mediawiki.api.edit' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js',
-               'dependencies' => array( 
+               'dependencies' => array(
                        'mediawiki.api',
-                       'mediawiki.Title' 
+                       'mediawiki.Title',
                ),
        ),
-       'mediawiki.api.parse' => array( 
+       'mediawiki.api.parse' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
                'dependencies' => 'mediawiki.api',
        ),
-       'mediawiki.api.titleblacklist' => array( 
+       'mediawiki.api.titleblacklist' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.titleblacklist.js',
-               'dependencies' => array( 
+               'dependencies' => array(
                        'mediawiki.api',
-                       'mediawiki.Title' 
+                       'mediawiki.Title',
                ),
        ),
-       'mediawiki.api.watch' => array( 
+       'mediawiki.api.watch' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js',
                'dependencies' => array(
                        'mediawiki.api',
@@ -572,13 +573,13 @@ return array(
        'mediawiki.feedback' => array(
                'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
                'styles' => 'resources/mediawiki/mediawiki.feedback.css',
-               'dependencies' => array( 
-                       'mediawiki.api.edit', 
+               'dependencies' => array(
+                       'mediawiki.api.edit',
                        'mediawiki.Title',
                        'mediawiki.jqueryMsg',
                        'jquery.ui.dialog',
                ),
-               'messages' => array( 
+               'messages' => array(
                        'feedback-bugornote',
                        'feedback-subject',
                        'feedback-message',
@@ -633,7 +634,6 @@ return array(
        ),
        '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(
@@ -724,11 +724,19 @@ return array(
                        'uk' => 'resources/mediawiki.language/languages/uk.js',
                        'wa' => 'resources/mediawiki.language/languages/wa.js',
                ),
+               'dependencies' => array( 'mediawiki.language.data' ),
+       ),
+
+       'mediawiki.language.init' => array(
+               'scripts' => 'resources/mediawiki.language/mediawiki.language.init.js',
        ),
 
        'mediawiki.jqueryMsg' => array(
-               'dependencies' => array( 'mediawiki.language', 'mediawiki.util' ),
-               'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js'
+               'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js',
+               'dependencies' => array(
+                       'mediawiki.util',
+                       'mediawiki.language',
+               ),
        ),
 
        /* MediaWiki Libs */