jenkins-bot has submitted this change and it was merged.
Change subject: $.wikibase.toolbarbutton: Fixed action handling
......................................................................
$.wikibase.toolbarbutton: Fixed action handling
Change-Id: Ie347aca537aabceb44bbb5b8991e99ba9b0e5cc2
---
M lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbarbutton.js
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbarbutton.js
b/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbarbutton.js
index 45fe88d..76e43e3 100644
--- a/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbarbutton.js
+++ b/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbarbutton.js
@@ -57,15 +57,12 @@
this.$link
.on( 'click.toolbarbutton keydown.toolbarbutton', function(
event ) {
- event.preventDefault();
+ if( event.type === 'click' || event.keyCode ===
$.ui.keyCode.ENTER ) {
+ event.preventDefault();
- if( self.options.disabled ) {
- return false;
- }
-
-
- if( event.type !== 'keydown' || event.keyCode ===
$.ui.keyCode.ENTER ) {
- self._trigger( 'action' );
+ if( !self.options.disabled ) {
+ self._trigger( 'action' );
+ }
}
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/173291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie347aca537aabceb44bbb5b8991e99ba9b0e5cc2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
