Merge "Add autocomplete for WhatLinksHere subpages"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 1049a6a..ad83e16 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -758,6 +758,7 @@ return array(
                        'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
                ),
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        /* MediaWiki */
@@ -1010,6 +1011,7 @@ return array(
                'class' => 'ResourceLoaderEditToolbarModule',
                'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
                'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
+               'position' => 'top',
        ),
 
        /* MediaWiki Action */
@@ -1019,7 +1021,6 @@ return array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => array(
                        'mediawiki.action.edit.styles',
-                       'mediawiki.toolbar',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@ -1043,6 +1044,7 @@ return array(
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
+                       'jquery.textSelection',
                        'mediawiki.api',
                        'mediawiki.action.history.diff',
                        'mediawiki.util',
@@ -1219,6 +1221,9 @@ return array(
 
        'mediawiki.page.gallery' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
+               'dependencies' => array(
+                       'jquery.throttle-debounce',
+               )
        ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
@@ -1461,7 +1466,9 @@ return array(
                        'colon-separator',
                        'javascripttest-pagetext-skins',
                ) ),
-               'dependencies' => array( 'jquery.qunit' ),
+               'dependencies' => array(
+                       'mediawiki.Uri',
+               ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -1627,12 +1634,12 @@ return array(
                        'resources/lib/oojs-ui/oojs-ui.js',
                ),
                'skinScripts' => array(
-                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
-                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
                ),
-               'skinStyles' => array(
-                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
-                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
+               'dependencies' => array(
+                       'es5-shim',
+                       'oojs',
+                       'oojs-ui.styles',
                ),
                'messages' => array(
                        'ooui-dialog-message-accept',
@@ -1648,9 +1655,13 @@ return array(
                        'ooui-toolgroup-collapse',
                        'ooui-toolgroup-expand',
                ),
-               'dependencies' => array(
-                       'es5-shim',
-                       'oojs',
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+
+       'oojs-ui.styles' => array(
+               'position' => 'top',
+               'skinStyles' => array(
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),