Made LocalFileMoveBatch::addOlds use SH locks instead of EX ones

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 2fa0c3a..7c2e8b3 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -245,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',
        ),
@@ -970,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(
@@ -986,6 +985,11 @@ return array(
                        'jquery.cookie',
                ),
        ),
+       'mediawiki.toolbar' => array(
+               'class' => 'ResourceLoaderEditToolbarModule',
+               'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
+               'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
+       ),
 
        /* MediaWiki Action */
 
@@ -994,7 +998,7 @@ return array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => array(
                        'mediawiki.action.edit.styles',
-                       'mediawiki.action.edit.toolbar',
+                       'mediawiki.toolbar',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@ -1004,10 +1008,6 @@ return array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
                'position' => 'top',
        ),
-       'mediawiki.action.edit.toolbar' => array(
-               'class' => 'ResourceLoaderEditToolbarModule',
-               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.toolbar/mediawiki.action.edit.toolbar.less',
-       ),
        'mediawiki.action.edit.collapsibleFooter' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
@@ -1087,6 +1087,7 @@ return array(
                ),
                'messages' => array(
                        'editwarning-warning',
+                       // editwarning-warning uses {{int:prefs-editing}}
                        'prefs-editing'
                ),
        ),
@@ -1115,9 +1116,9 @@ return array(
                        'uk' => 'resources/src/mediawiki.language/languages/uk.js',
                ),
                'dependencies' => array(
-                               'mediawiki.language.data',
-                               'mediawiki.cldr',
-                       ),
+                       'mediawiki.language.data',
+                       'mediawiki.cldr',
+               ),
                'targets' => array( 'desktop', 'mobile' ),
                'messages' => array(
                        'and',
@@ -1522,8 +1523,20 @@ 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' ),
+       ),
+       // Lightweight module for text styles
+       'mediawiki.ui.text' => array(
+               'skinStyles' => array(
+                       'default' => array(
+                               'resources/src/mediawiki.ui/components/text.less',
+                       ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1558,13 +1571,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-mediawiki.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-mediawiki.svg.css',
                ),
                'messages' => array(
                        'ooui-outline-control-move-down',