From aca1545513c064f41b4083a559e3dc0370875d70 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 19 Apr 2016 16:02:58 +0530 Subject: [PATCH] Compact links: The trigger kept pressed while the panel is open Bug: T70078 Change-Id: Iaac9d7f2a5ec5da049b2b4c8e88a9f0bc2a91bda --- resources/css/ext.uls.compactlinks.less | 6 ++++++ resources/js/ext.uls.compactlinks.js | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/css/ext.uls.compactlinks.less b/resources/css/ext.uls.compactlinks.less index 685d5142..0dbd7394 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 fb329106..995f3f41 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 @@ -159,6 +162,9 @@ .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, languages: ulsLanguageList, @@ -319,7 +325,7 @@ var $trigger; $trigger = $( '