Merge "Fix SpecialPageFactory list handling"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index b9b2c8d..e32e4a5 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -93,6 +93,7 @@ return array(
                ),
        ),
        'mediawiki.skinning.interface' => array(
+               'class' => 'ResourceLoaderSkinModule',
                // Used in the web installer. Test it after modifying this definition!
                'styles' => array(
                        'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
@@ -244,14 +245,6 @@ return array(
        'jquery.hoverIntent' => array(
                'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
        ),
-       'jquery.json' => array(
-               // @deprecated since 1.24: Use the 'json' module and global JSON object instead.
-               'scripts' => array(
-                       'resources/lib/jquery/jquery.json.js',
-                       'resources/src/jquery.json-deprecate.js',
-               ),
-               'targets' => array( 'mobile', 'desktop' ),
-       ),
        'jquery.localize' => array(
                'scripts' => 'resources/src/jquery/jquery.localize.js',
        ),
@@ -819,6 +812,11 @@ return array(
        'mediawiki.content.json' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
        ),
+       'mediawiki.confirmCloseWindow' => array(
+               'scripts' => array(
+                       'resources/src/mediawiki/mediawiki.confirmCloseWindow.js',
+               ),
+       ),
        'mediawiki.debug' => array(
                'scripts' => array(
                        'resources/src/mediawiki/mediawiki.debug.js',
@@ -964,6 +962,13 @@ return array(
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.userSuggest' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.userSuggest.js',
+               'dependencies' => array(
+                       'jquery.suggestions',
+                       'mediawiki.api'
+               )
+       ),
        'mediawiki.util' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
                'dependencies' => array(
@@ -1034,6 +1039,7 @@ return array(
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.page.startup',
+                       'user.options',
                ),
        ),
        'mediawiki.action.view.metadata' => array(
@@ -1064,11 +1070,6 @@ return array(
                ),
                'position' => 'top',
        ),
-       // Deployment hack for compatibility with cached HTML, remove before 1.24 release
-       'mediawiki.action.view.redirectToFragment' => array(
-               'dependencies' => 'mediawiki.action.view.redirect',
-               'position' => 'top',
-       ),
        'mediawiki.action.view.redirectPage' => array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css',
                'position' => 'top',
@@ -1080,7 +1081,8 @@ return array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
                'dependencies' => array(
                        'jquery.textSelection',
-                       'mediawiki.jqueryMsg'
+                       'mediawiki.jqueryMsg',
+                       'mediawiki.confirmCloseWindow',
                ),
                'messages' => array(
                        'editwarning-warning',
@@ -1330,13 +1332,18 @@ return array(
                        'size-megabytes',
                        'size-gigabytes',
                        'largefileserver',
+                       'editwarning-warning',
+                       // editwarning-warning uses {{int:prefs-editing}}
+                       'prefs-editing',
                ),
                'dependencies' => array(
                        'jquery.spinner',
+                       'mediawiki.jqueryMsg',
                        'mediawiki.api',
                        'mediawiki.libs.jpegmeta',
                        'mediawiki.Title',
                        'mediawiki.util',
+                       'mediawiki.confirmCloseWindow',
                ),
        ),
        'mediawiki.special.userlogin.common.styles' => array(
@@ -1514,8 +1521,10 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.icon' => array(
-               'styles' => array(
-                       'resources/src/mediawiki.ui/components/icons.less',
+               'skinStyles' => array(
+                       'default' => array(
+                               'resources/src/mediawiki.ui/components/icons.less',
+                       ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1550,13 +1559,13 @@ return array(
                'scripts' => array(
                        'resources/lib/oojs-ui/oojs-ui.js',
                ),
-               'styles' => array(
-                       'resources/lib/oojs-ui/oojs-ui.svg.css',
+               'skinScripts' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
+                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.js',
                ),
                'skinStyles' => array(
-                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.css',
-                       // FIXME As of July 2014, this is to be gone "in a couple of months".
-                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.css',
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
+                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-minerva.svg.css',
                ),
                'messages' => array(
                        'ooui-outline-control-move-down',