jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.page.watch.ajax: Don't use deprecated
tooltipAccessKeyRegexp
......................................................................
mediawiki.page.watch.ajax: Don't use deprecated tooltipAccessKeyRegexp
Remove dependency on 'mediawiki.page.startup' since this is no
longer needed (it was there to ensure mw.util.init, which used to
populate mw.util.tooltipAccessKeyRegexp, ran first).
Change-Id: Iceecc228bce676de84de35220fa4d217be0f0b75
---
M resources/Resources.php
M resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
M resources/src/mediawiki/mediawiki.util.js
3 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Umherirrender: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index 6057b39..93022b2 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1136,10 +1136,10 @@
'mediawiki.page.watch.ajax' => array(
'scripts' =>
'resources/src/mediawiki.page/mediawiki.page.watch.ajax.js',
'dependencies' => array(
- 'mediawiki.page.startup',
'mediawiki.api.watch',
- 'mediawiki.util',
'mediawiki.notify',
+ 'mediawiki.util',
+ 'jquery.accessKeyLabel',
'jquery.mwExtension',
),
'messages' => array(
diff --git a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
index 850177f..3b0aeee 100644
--- a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -17,7 +17,7 @@
* @param {string} [state="idle"] 'idle' or 'loading'. Default is 'idle'
*/
function updateWatchLink( $link, action, state ) {
- var accesskeyTip, msgKey, $li, otherAction;
+ var msgKey, $li, otherAction;
// A valid but empty jQuery object shouldn't throw a TypeError
if ( !$link.length ) {
@@ -32,7 +32,6 @@
// message keys 'watch', 'watching', 'unwatch' or 'unwatching'.
msgKey = state === 'loading' ? action + 'ing' : action;
otherAction = action === 'watch' ? 'unwatch' : 'watch';
- accesskeyTip = $link.attr( 'title' ).match(
mw.util.tooltipAccessKeyRegexp );
$li = $link.closest( 'li' );
// Trigger a 'watchpage' event for this List item.
@@ -45,9 +44,8 @@
$link
.text( mw.msg( msgKey ) )
- .attr( 'title', mw.msg( 'tooltip-ca-' + action ) +
- ( accesskeyTip ? ' ' + accesskeyTip[0] : '' )
- )
+ .attr( 'title', mw.msg( 'tooltip-ca-' + action ) )
+ .updateTooltipAccessKeys()
.attr( 'href', mw.util.wikiScript() + '?' + $.param( {
title: title,
action: action
diff --git a/resources/src/mediawiki/mediawiki.util.js
b/resources/src/mediawiki/mediawiki.util.js
index 221ac74..298415c 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -474,10 +474,10 @@
*
* Should match:
*
- * - "ctrl-option-"
- * - "alt-shift-"
- * - "ctrl-alt-"
- * - "ctrl-"
+ * - "[ctrl-option-x]"
+ * - "[alt-shift-x]"
+ * - "[ctrl-alt-x]"
+ * - "[ctrl-x]"
*
* The accesskey is matched in group $6.
*
--
To view, visit https://gerrit.wikimedia.org/r/132003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iceecc228bce676de84de35220fa4d217be0f0b75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
