Merge "RCFilters: Display specific error if query times out"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 06012b8..b9986fe 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -132,14 +132,10 @@ return [
        /* jQuery */
 
        'jquery' => [
-               'scripts' => ( $GLOBALS['wgUsejQueryThree'] ?
-                       [
-                               'resources/lib/jquery/jquery3.js',
-                               'resources/lib/jquery/jquery.migrate.js',
-                       ] : [
-                               'resources/lib/jquery/jquery.js',
-                       ]
-               ),
+               'scripts' => [
+                       'resources/lib/jquery/jquery3.js',
+                       'resources/lib/jquery/jquery.migrate.js',
+               ],
                'raw' => true,
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -169,6 +165,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.badge' => [
+               'deprecated' => 'Please use Notifications instead.',
                'scripts' => 'resources/src/jquery/jquery.badge.js',
                'styles' => 'resources/src/jquery/jquery.badge.css',
                'dependencies' => 'mediawiki.language',
@@ -1705,7 +1702,6 @@ return [
        'mediawiki.page.watch.ajax' => [
                'scripts' => 'resources/src/mediawiki/page/watch.js',
                'dependencies' => [
-                       'mediawiki.page.startup',
                        'mediawiki.api.watch',
                        'mediawiki.notify',
                        'mediawiki.util',
@@ -1916,6 +1912,7 @@ return [
                        'namespaces',
                        'invert',
                        'recentchanges-noresult',
+                       'recentchanges-timeout',
                        'quotation-marks',
                ],
                'dependencies' => [