jenkins-bot has submitted this change and it was merged. Change subject: Compact links: The trigger kept pressed while the panel is open ......................................................................
Compact links: The trigger kept pressed while the panel is open Bug: T70078 Change-Id: Iaac9d7f2a5ec5da049b2b4c8e88a9f0bc2a91bda --- M resources/css/ext.uls.compactlinks.less M resources/js/ext.uls.compactlinks.js 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Nikerabbit: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/resources/css/ext.uls.compactlinks.less b/resources/css/ext.uls.compactlinks.less index 685d514..0dbd739 100644 --- a/resources/css/ext.uls.compactlinks.less +++ b/resources/css/ext.uls.compactlinks.less @@ -20,6 +20,12 @@ text-align: left; } +.mw-interlanguage-selector:active, +.mw-interlanguage-selector.selector-open { + color: #555555; + background-color: #cccccc; +} + .interlanguage-uls-menu:before { background: none repeat scroll 0 0 #FCFCFC; border-left: 1px solid rgba( 0, 0, 0, 0.2 ); diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js index fb32910..995f3f4 100644 --- a/resources/js/ext.uls.compactlinks.js +++ b/resources/js/ext.uls.compactlinks.js @@ -116,6 +116,8 @@ onSelect: function ( language ) { var previousLanguages = mw.uls.getPreviousLanguages(); + compactLinks.$trigger.removeClass( 'selector-open' ); + previousLanguages.push( language ); previousLanguages = unique( previousLanguages ); mw.uls.setPreviousLanguages( previousLanguages ); @@ -149,6 +151,7 @@ left: this.left, top: this.top } ); + compactLinks.$trigger.addClass( 'selector-open' ); }, languageDecorator: function ( $languageLink, language ) { // set href and text exactly same as what was in @@ -158,6 +161,9 @@ $languageLink .prop( 'href', compactLinks.interlanguageList[ language ].href ) .text( compactLinks.interlanguageList[ language ].autonym ); + }, + onCancel: function () { + compactLinks.$trigger.removeClass( 'selector-open' ); }, // Use compact version of ULS compact: true, @@ -319,7 +325,7 @@ var $trigger; $trigger = $( '<button>' ) - .addClass( 'mw-interlanguage-selector mw-ui-button active' ) + .addClass( 'mw-interlanguage-selector mw-ui-button' ) .html( $.i18n( 'ext-uls-compact-link-count', mw.language.convertNumber( this.listSize - this.compactSize ) -- To view, visit https://gerrit.wikimedia.org/r/284153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaac9d7f2a5ec5da049b2b4c8e88a9f0bc2a91bda Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits