Merge "DatabaseMssql: Don't duplicate body of makeList()"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 6e8cd99..486dd36 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -266,8 +266,8 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.qunit' => array(
-               'scripts' => 'resources/lib/jquery/jquery.qunit.js',
-               'styles' => 'resources/lib/jquery/jquery.qunit.css',
+               'scripts' => 'resources/lib/qunitjs/qunit.js',
+               'styles' => 'resources/lib/qunitjs/qunit.css',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -765,7 +765,10 @@ return array(
        /* MediaWiki */
 
        'mediawiki' => array(
-               'scripts' => 'resources/src/mediawiki/mediawiki.js',
+               'scripts' => array(
+                       'resources/src/mediawiki/mediawiki.js',
+                       'resources/src/mediawiki/mediawiki.startUp.js',
+               ),
                'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
                'raw' => true,
                'targets' => array( 'desktop', 'mobile' ),
@@ -1073,7 +1076,9 @@ return array(
        'mediawiki.action.history.diff' => array(
                'styles' => array(
                        'resources/src/mediawiki.action/mediawiki.action.history.diff.css',
-                       'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => array( 'media' => 'print' ),
+                       'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => array(
+                               'media' => 'print'
+                       ),
                ),
                'group' => 'mediawiki.action.history',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1662,7 +1667,7 @@ return array(
        'oojs-ui.styles' => array(
                'position' => 'top',
                'skinStyles' => array(
-                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.css',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),