jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.uls to d4de09ffb94dd9682
......................................................................
Update jquery.uls to d4de09ffb94dd9682
* Improve the hide-show logic of ULS
Bug: T114123
Change-Id: If7a23b035edf3117520a9c313997a26c7b6c4857
---
M lib/jquery.uls/src/jquery.uls.core.js
1 file changed, 6 insertions(+), 8 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index 201d384..529b47a 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -177,9 +177,6 @@
this.initialized = true;
}
- // hide any other visible ULS
- $( '.uls-menu' ).hide();
-
this.$menu.show();
this.$menu.scrollIntoView();
this.shown = true;
@@ -321,7 +318,11 @@
/**
* On cancel handler for the uls menu
*/
- cancel: function () {
+ cancel: function ( e ) {
+ if ( e && this.$element.is( e.target ) ) {
+ return;
+ }
+
this.hide();
if ( this.options.onCancel ) {
@@ -353,10 +354,7 @@
}
},
- click: function ( e ) {
- e.stopPropagation();
- e.preventDefault();
-
+ click: function () {
if ( this.shown ) {
this.hide();
} else {
--
To view, visit https://gerrit.wikimedia.org/r/243877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7a23b035edf3117520a9c313997a26c7b6c4857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
