Drop "left in" debugging var_dump from WikiImporter

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

diff --git a/resources/Resources.php b/resources/Resources.php
index adeda88..1c0e83b 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -946,6 +946,7 @@ return array(
        ),
        'mediawiki.Uri' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
+               'dependencies' => 'mediawiki.util',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.user' => array(
@@ -1186,6 +1187,7 @@ return array(
                'dependencies' => array(
                        'mediawiki.api.watch',
                        'mediawiki.notify',
+                       'mediawiki.page.startup',
                        'mediawiki.util',
                        'jquery.accessKeyLabel',
                        'jquery.mwExtension',
@@ -1360,7 +1362,8 @@ return array(
                        'mediawiki.api',
                        'mediawiki.api.watch',
                        'mediawiki.notify',
-                       'mediawiki.Title'
+                       'mediawiki.Title',
+                       'mediawiki.util',
                ),
        ),
        'mediawiki.special.javaScriptTest' => array(
@@ -1377,6 +1380,15 @@ return array(
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
        ),
 
+       /* MediaWiki Installer */
+
+       'mediawiki.legacy.config' => array(
+               // Used in the web installer. Test it after modifying this definition!
+               // These files are not actually loaded via ResourceLoader, so dependencies etc. won't work.
+               'scripts' => 'mw-config/config.js',
+               'styles' => 'mw-config/config.css',
+       ),
+
        /* MediaWiki Legacy */
 
        'mediawiki.legacy.ajax' => array(
@@ -1394,14 +1406,6 @@ return array(
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
-       'mediawiki.legacy.config' => array(
-               // Used in the web installer. Test it after modifying this definition!
-               'scripts' => 'common/config.js',
-               'styles' => array( 'common/config.css' ),
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => 'mediawiki.legacy.wikibits',
-       ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'common/protect.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
@@ -1456,6 +1460,8 @@ return array(
                'styles' => array(
                        'resources/src/mediawiki.ui/components/checkbox.less',
                ),
+               'position' => 'top',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        // Lightweight module for anchor styles
        'mediawiki.ui.anchor' => array(