Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/64474
Change subject: Update from upstream ...................................................................... Update from upstream This change fixes a bug in the display of the IME selector in TUX and adds a new rule for Malayalam transliteration. Change-Id: Ib37f26f7c2cb1e6b301cbaae676e9cb960146da5 --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/ml/ml-transliteration.js 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/74/64474/1 diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index f93db47..e8eae76 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0 - 2013-05-08 +/*! jquery.ime - v0.1.0 - 2013-05-18 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -693,12 +693,18 @@ position = this.$element.offset(); top = position.top + this.$element.outerHeight(); left = position.left; + // RTL element position fix: if ( this.$element.css( 'direction' ) === 'ltr' ) { left = position.left + this.$element.outerWidth() - this.$imeSetting.outerWidth(); } - room = $( window ).height() - top; + + // While determining whether to place the selector above or below the input box, + // take into account the value of scrollTop to avoid the selector from always + // getting placed above the input box since window.height would be less than top + // if the page has been scrolled. + room = $( window ).height() + $( document ).scrollTop() - top; if ( room < this.$imeSetting.outerHeight() ) { top = position.top - this.$imeSetting.outerHeight(); @@ -753,7 +759,11 @@ if ( ime.getLanguage() === languageCode ) { // nothing to do. It is same as the current language - return false; + // but check whether input method changed + if( ime.inputmethod && + ime.inputmethod.id === $.ime.preferences.getIM( languageCode ) ) { + return false; + } } this.$menu.find( 'li.ime-lang' ).show(); diff --git a/lib/jquery.ime/rules/ml/ml-transliteration.js b/lib/jquery.ime/rules/ml/ml-transliteration.js index 61cc8dc..8533706 100644 --- a/lib/jquery.ime/rules/ml/ml-transliteration.js +++ b/lib/jquery.ime/rules/ml/ml-transliteration.js @@ -137,6 +137,7 @@ [ 'ൻy', 'ന്യ്' ], [ 'ർ\\\\\\\\', 'ര്\u200d' ], // old style chill r [ 'ർ~', 'ര്' ], + [ 'ർ#', 'ൎ' ], // dot repha [ 'ർr', 'റ്' ], [ 'ർR', 'രൃ' ], [ 'ർy', 'ര്യ്' ], -- To view, visit https://gerrit.wikimedia.org/r/64474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib37f26f7c2cb1e6b301cbaae676e9cb960146da5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
