jenkins-bot has submitted this change and it was merged.
Change subject: jquery.makeCollapsible: No tabindex="0" for default buttons
......................................................................
jquery.makeCollapsible: No tabindex="0" for default buttons
A button with <a href="#"> is already selectable with tabs.
The tabindex="0" generates an additional selectable element.
Change-Id: I99b51129dc7fb3b2496c393607f7d8ae7854a0b6
---
M resources/src/jquery/jquery.makeCollapsible.js
1 file changed, 13 insertions(+), 12 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/jquery/jquery.makeCollapsible.js
b/resources/src/jquery/jquery.makeCollapsible.js
index 05745f8..a4dc33b 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -292,8 +292,8 @@
} else {
collapsibleId = $collapsible.attr( 'id' ) || '';
if ( collapsibleId.indexOf(
'mw-customcollapsible-' ) === 0 ) {
- $customTogglers = $( '.' +
collapsibleId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) );
- $customTogglers.addClass(
'mw-customtoggle' );
+ $customTogglers = $( '.' +
collapsibleId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) )
+ .addClass( 'mw-customtoggle' );
}
}
@@ -305,8 +305,9 @@
togglingHandler( $( this ),
$collapsible, e, opts );
};
- $toggleLink = $customTogglers;
- $toggleLink.on( 'click.mw-collapsible
keypress.mw-collapsible', actionHandler );
+ $toggleLink = $customTogglers
+ .on( 'click.mw-collapsible
keypress.mw-collapsible', actionHandler )
+ .prop( 'tabIndex', 0 );
} else {
// If this is not a custom case, do the
default: wrap the
@@ -325,7 +326,8 @@
$toggleLink =
buildDefaultToggleLink().appendTo( $caption );
} else {
actionHandler =
premadeToggleHandler;
- $toggleLink =
$toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+ $toggleLink =
$toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler )
+ .prop(
'tabIndex', 0 );
}
} else {
// The toggle-link will be in
one the the cells (td or th) of the first row
@@ -337,7 +339,8 @@
$toggleLink =
buildDefaultToggleLink().prependTo( $firstItem.eq( -1 ) );
} else {
actionHandler =
premadeToggleHandler;
- $toggleLink =
$toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+ $toggleLink =
$toggle.on( 'click.mw-collapsible keypress.mw-collapsible', actionHandler )
+ .prop(
'tabIndex', 0 );
}
}
@@ -359,7 +362,8 @@
$toggleLink.wrap( '<li
class="mw-collapsible-toggle-li"></li>' ).parent().prependTo( $collapsible );
} else {
actionHandler =
premadeToggleHandler;
- $toggleLink = $toggle.on(
'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+ $toggleLink = $toggle.on(
'click.mw-collapsible keypress.mw-collapsible', actionHandler )
+ .prop( 'tabIndex', 0 );
}
} else { // <div>, <p> etc.
@@ -377,14 +381,11 @@
$toggleLink =
buildDefaultToggleLink().prependTo( $collapsible );
} else {
actionHandler =
premadeToggleHandler;
- $toggleLink = $toggle.on(
'click.mw-collapsible keypress.mw-collapsible', actionHandler );
+ $toggleLink = $toggle.on(
'click.mw-collapsible keypress.mw-collapsible', actionHandler )
+ .prop( 'tabIndex', 0 );
}
}
}
-
- // Attributes for accessibility. This isn't necessary
when the toggler is already
- // an <a> or a <button> etc., but it doesn't hurt
either, and it's consistent.
- $toggleLink.prop( 'tabIndex', 0 );
// Initial state
if ( options.collapsed || $collapsible.hasClass(
'mw-collapsed' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/141646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99b51129dc7fb3b2496c393607f7d8ae7854a0b6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
