jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream * selectLanguage need to check whether ime changed before return with noop * Add dot reph(0D4E) to Malayalam transliteration Change-Id: I35c05e8261270096ceb652db9b0dc24be9fa71fc --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/mh/mh.js M lib/jquery.ime/rules/ml/ml-transliteration.js 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index f93db47..d1cb7d6 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-17 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -753,7 +753,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/mh/mh.js b/lib/jquery.ime/rules/mh/mh.js old mode 100755 new mode 100644 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/64261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35c05e8261270096ceb652db9b0dc24be9fa71fc Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
