Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61369
Change subject: Fix tipsy behaviour
......................................................................
Fix tipsy behaviour
* Make it visible in interlanguage position
* Do not get stuck in no-tooltip state if previous lang is invalid
Change-Id: Iaf5727a8a729579c2a0c79d0e0dc49d58bbf66ea
---
M resources/js/ext.uls.interface.js
1 file changed, 12 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/69/61369/1
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index dd7b39f..6b071db 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -171,21 +171,18 @@
uls = $ulsTrigger.data( 'uls' );
- if ( !previousLang ) {
- previousLanguages.push( currentLang );
- mw.uls.setPreviousLanguages( previousLanguages );
-
- // Do not show tooltip.
- return true;
- }
-
- if ( previousLang === currentLang ||
!$.uls.data.languages[previousLang] ) {
- // Do not show tooltip.
+ if ( previousLang === currentLang ) {
+ // Do not show tooltip nor update language list
return true;
}
previousLanguages.push( currentLang );
mw.uls.setPreviousLanguages( previousLanguages );
+
+ if ( !previousLang || !$.uls.data.languages[previousLang] ) {
+ // Do not show tooltip
+ return true;
+ }
// Attach a tipsy tooltip to the trigger
$ulsTrigger.tipsy( {
@@ -238,8 +235,11 @@
$ulsTrigger.tipsy( 'hide' );
}
- // Show the tipsy tooltip on page load.
- showTipsy( 6000 );
+ // The interlanguage position needs some time to settle down
+ window.setTimeout( function() {
+ // Show the tipsy tooltip on page load.
+ showTipsy( 6000 );
+ }, 500 );
// manually show the tooltip
$ulsTrigger.on( 'mouseover', function () {
--
To view, visit https://gerrit.wikimedia.org/r/61369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf5727a8a729579c2a0c79d0e0dc49d58bbf66ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
