From f168493b57426650102f2aee66c05a7d5f4d7e31 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 6 Sep 2019 16:26:12 +0100
Subject: [PATCH] mediawiki.util: Merge 'jquery.accessKeyLabel' into this
 module

Bug: T218339
Change-Id: I7aff1cf5a9526ef54cad33f5333361dba0efb1db
---
 RELEASE-NOTES-1.34                                |  2 ++
 resources/Resources.php                           | 15 +++++++--------
 .../jquery.accessKeyLabel.js                      |  0
 resources/src/mediawiki.util/util.js              |  2 ++
 tests/qunit/QUnitTestResources.php                |  1 -
 5 files changed, 11 insertions(+), 9 deletions(-)
 rename resources/src/{jquery => mediawiki.util}/jquery.accessKeyLabel.js (100%)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 828d0fb807..a86fa2dd7d 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -425,6 +425,8 @@ 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 55bd780a5a..cfcfc19eb3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -156,12 +156,10 @@ return [
 	/* jQuery Plugins */
 
 	'jquery.accessKeyLabel' => [
-		'scripts' => 'resources/src/jquery/jquery.accessKeyLabel.js',
+		'deprecated' => 'Please use "mediawiki.util" instead.',
 		'dependencies' => [
-			'jquery.client',
-			'mediawiki.RegExp',
+			'mediawiki.util',
 		],
-		'messages' => [ 'brackets', 'word-separator' ],
 		'targets' => [ 'mobile', 'desktop' ],
 	],
 	'jquery.checkboxShiftClick' => [
@@ -1252,18 +1250,20 @@ return [
 	],
 	'mediawiki.util' => [
 		'localBasePath' => "$IP/resources/src/mediawiki.util/",
-		'remoteBasePath' => "$wgResourceBasePath/resources/srcmediawiki.util/",
+		'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util/",
 		'packageFiles' => [
 			'util.js',
+			'jquery.accessKeyLabel.js',
 			[ 'name' => 'config.json', 'config' => [
 				'FragmentMode',
 				'LoadScript',
 			] ],
 		],
 		'dependencies' => [
-			'jquery.accessKeyLabel',
+			'jquery.client',
 			'mediawiki.RegExp',
 		],
+		'messages' => [ 'brackets', 'word-separator' ],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.viewport' => [
@@ -1660,8 +1660,8 @@ return [
 	'mediawiki.page.ready' => [
 		'scripts' => 'resources/src/mediawiki.page.ready.js',
 		'dependencies' => [
-			'jquery.accessKeyLabel',
 			'jquery.checkboxShiftClick',
+			'mediawiki.util',
 			'mediawiki.notify',
 			'mediawiki.api'
 		],
@@ -1699,7 +1699,6 @@ return [
 			'mediawiki.util',
 			'mediawiki.Title',
 			'mediawiki.jqueryMsg',
-			'jquery.accessKeyLabel',
 			'mediawiki.RegExp',
 		],
 		'messages' => [
diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/mediawiki.util/jquery.accessKeyLabel.js
similarity index 100%
rename from resources/src/jquery/jquery.accessKeyLabel.js
rename to resources/src/mediawiki.util/jquery.accessKeyLabel.js
diff --git a/resources/src/mediawiki.util/util.js b/resources/src/mediawiki.util/util.js
index 36a0195d84..7e0722f442 100644
--- a/resources/src/mediawiki.util/util.js
+++ b/resources/src/mediawiki.util/util.js
@@ -4,6 +4,8 @@
 	var util,
 		config = require( './config.json' );
 
+	require( './jquery.accessKeyLabel.js' );
+
 	/**
 	 * Encode the string like PHP's rawurlencode
 	 * @ignore
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index d55b603ba9..76f4f82c89 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -102,7 +102,6 @@ return [
 			'tests/qunit/suites/resources/mediawiki/mediawiki.visibleTimeout.test.js',
 		],
 		'dependencies' => [
-			'jquery.accessKeyLabel',
 			'jquery.color',
 			'jquery.colorUtil',
 			'jquery.getAttrs',
-- 
2.20.1