Merge "Add .rej files to .gitignore"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index ce52846..33bdcb9 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -300,6 +300,8 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.placeholder' => [
+               'deprecated' => 'Use of "jquery.placeholder" is deprecated since MediaWiki 1.29.0',
+
                'scripts' => 'resources/src/jquery/jquery.placeholder.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -715,8 +717,6 @@ return [
        ],
 
        /* json2 */
-
-       // Deprecated since MediaWiki 1.29.0
        'json' => [
                'deprecated' => 'Use of the "json" module is deprecated since MediaWiki 1.29.0',
                'targets' => [ 'desktop', 'mobile' ],
@@ -1178,7 +1178,6 @@ return [
                        'searchsuggest-containing',
                ],
                'dependencies' => [
-                       'jquery.placeholder',
                        'jquery.suggestions',
                        'jquery.getAttrs',
                        'mediawiki.api',
@@ -1656,7 +1655,6 @@ return [
                'dependencies' => [
                        'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
-                       'jquery.placeholder',
                        'jquery.mw-jump',
                ],
                'targets' => [ 'desktop', 'mobile' ],
@@ -2454,18 +2452,14 @@ return [
                        'oojs-ui-core',
                ],
        ],
+
        /* es5-shim */
        'es5-shim' => [
-               'scripts' => [
-                       'resources/lib/es5-shim/es5-shim.js',
-                       'resources/src/polyfill-object-create.js',
-               ],
+               'deprecated' => 'Use of the "es5-shim" module is deprecated since MediaWiki 1.29.0',
                'targets' => [ 'desktop', 'mobile' ],
-               'skipFunction' => 'resources/src/es5-skip.js',
        ],
 
        /* dom-level2-shim */
-       // Deprecated since MediaWiki 1.29.0
        'dom-level2-shim' => [
                'deprecated' => 'Use of the "dom-level2-shim" module is deprecated since MediaWiki 1.29.0',
                'targets' => [ 'desktop', 'mobile' ],
@@ -2478,9 +2472,6 @@ return [
                        'resources/src/oojs-global.js',
                ],
                'targets' => [ 'desktop', 'mobile' ],
-               'dependencies' => [
-                       'es5-shim',
-               ],
        ],
 
        'mediawiki.router' => [