Merge "Remove redundant 'jquery.accessKeylabel' module alias"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 136ecc3..173a5da 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -317,6 +317,8 @@ because of Phabricator reports.
 * The jquery.colorUtil module was removed. Use jquery.color instead.
 * The jquery.checkboxShiftClick module was removed. The functionality
   is provided by mediawiki.page.ready instead (T232688).
+* The 'jquery.accessKeyLabel' module has been removed. This jQuery
+  plugin now ships as part of the 'mediawiki.util' module bundle.
 * EditPage::submit(), deprecated in 1.29, has been removed. Use $this->edit()
   directly.
 * HTMLForm::getErrors(), deprecated in 1.28, has been removed. Use
@@ -501,8 +503,6 @@ because of Phabricator reports.
 * ResourceLoaderContext::getConfig and ResourceLoaderContext::getLogger have
   been deprecated. Inside ResourceLoaderModule subclasses, use the local methods
   instead. Elsewhere, use the methods from the ResourceLoader class.
-* The 'jquery.accessKeyLabel' module has been deprecated. This jQuery
-  plugin is now ships as part of the 'mediawiki.util' module bundle.
 * The Profiler::setTemplated and Profiler::getTemplated methods have been
   deprecated. Use Profiler::setAllowOutput and Profiler::getAllowOutput
   instead.

diff --git a/resources/Resources.php b/resources/Resources.php
index b8f23d5..c8eae03 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -155,13 +155,6 @@ return [
 
        /* jQuery Plugins */
 
-       'jquery.accessKeyLabel' => [
-               'deprecated' => 'Please use "mediawiki.util" instead.',
-               'dependencies' => [
-                       'mediawiki.util',
-               ],
-               'targets' => [ 'mobile', 'desktop' ],
-       ],
        'jquery.chosen' => [
                'scripts' => 'resources/lib/jquery.chosen/chosen.jquery.js',
                'styles' => 'resources/lib/jquery.chosen/chosen.css',