[MediaWiki-commits] [Gerrit] Compact links: The trigger kept pressed while the panel is open - change (mediawiki...UniversalLanguageSelector)
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: #55;
+ background-color: #cc;
+}
+
.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 = $( '' )
- .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
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Compact links: The trigger kept pressed while the panel is open - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284153
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.css
M resources/js/ext.uls.compactlinks.js
2 files changed, 12 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/53/284153/1
diff --git a/resources/css/ext.uls.compactlinks.css
b/resources/css/ext.uls.compactlinks.css
index b940a44..68e87d9 100644
--- a/resources/css/ext.uls.compactlinks.css
+++ b/resources/css/ext.uls.compactlinks.css
@@ -18,6 +18,12 @@
text-align: left;
}
+.mw-interlanguage-selector:hover,
+.mw-interlanguage-selector.selector-open {
+ color: #55;
+ background-color: #cc;
+}
+
.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..e3fd98b 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,
--
To view, visit https://gerrit.wikimedia.org/r/284153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaac9d7f2a5ec5da049b2b4c8e88a9f0bc2a91bda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
