jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Fixes issue: Native Keyboard selection not reflected on the input fields Version: 0.1.0+20130605 Bug: 49152 Change-Id: I1f16b3d8084bec8a4b7ab0b28bbe71777b44c077 --- M lib/jquery.ime/jquery.ime.js 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Nikerabbit: 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 437f916..2b764d1 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20130531 +/*! jquery.ime - v0.1.0+20130605 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -772,11 +772,11 @@ if ( ime.getLanguage() === languageCode ) { // Nothing to do. It is same as the current language, // but check whether the input method changed. - if ( ime.inputmethod && ime.inputmethod.id === imePref - || imePref === 'system' - ) { - return false; + if ( ime.inputmethod && ime.inputmethod.id !== imePref ) { + this.selectIM( $.ime.preferences.getIM( languageCode ) ); } + + return false; } this.$menu.find( 'li.ime-lang' ).show(); -- To view, visit https://gerrit.wikimedia.org/r/67049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f16b3d8084bec8a4b7ab0b28bbe71777b44c077 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Santhosh <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
