jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Bug: 50790 Change-Id: I3755581136cca9958e31b20694c4285c14646c38 --- M lib/jquery.ime/jquery.ime.js D lib/jquery.ime/rules/he/he-kbd.js 2 files changed, 30 insertions(+), 69 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 f050bdf..7286fef 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20130626 +/*! jquery.ime - v0.1.0+20130707 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -187,8 +187,9 @@ }, setLanguage: function ( languageCode ) { - if ( $.inArray( languageCode, this.options.languages ) === -1 ) { + if ( !$.ime.languages[languageCode] ) { debug( 'Language ' + languageCode + ' is not known to jquery.ime.' ); + return false; } @@ -668,6 +669,7 @@ keydown: function ( e ) { var ime = $( e.target ).data( 'ime' ), firstInputmethod, + previousInputMethods, languageCode; this.focus(); // shows the trigger in case it is hidden @@ -683,9 +685,15 @@ this.selectLanguage( languageCode ); if ( !ime.isActive() && $.ime.languages[languageCode] ) { // Even after pressing toggle shortcut again, it is still disabled - // Provide the default input method in this case. - firstInputmethod = $.ime.languages[languageCode].inputmethods[0]; - this.selectIM( firstInputmethod ); + // Check if there is a previously used input method. + previousInputMethods = $.ime.preferences.getPreviousInputMethods(); + if ( previousInputMethods[0] ) { + this.selectIM( previousInputMethods[0] ); + } else { + // Provide the default input method in this case. + firstInputmethod = $.ime.languages[languageCode].inputmethods[0]; + this.selectIM( firstInputmethod ); + } } } } @@ -1091,6 +1099,7 @@ isDirty: false, language : null, previousLanguages: [], // array of previous languages + previousInputMethods: [], // array of previous inputmethods imes: { 'en': 'system' } @@ -1110,7 +1119,8 @@ // Add to the previous languages, but avoid duplicates. if ( $.inArray( language, this.registry.previousLanguages ) === -1 ) { - this.registry.previousLanguages.push( language ); + this.registry.previousLanguages.unshift( language ); + this.registry.previousLanguages = this.registry.previousLanguages.slice( 0, 5 ); } }, @@ -1126,6 +1136,10 @@ return this.registry.previousLanguages; }, + getPreviousInputMethods: function () { + return this.registry.previousInputMethods; + }, + // Set the given IM as the last used for the language setIM: function ( inputMethod ) { if ( !this.registry.imes ) { @@ -1139,6 +1153,15 @@ this.registry.imes[this.getLanguage()] = inputMethod; this.registry.isDirty = true; + if ( !this.registry.previousInputMethods ) { + this.registry.previousInputMethods = []; + } + + // Add to the previous languages, + if ( inputMethod !== 'system' ) { + this.registry.previousInputMethods.unshift( inputMethod ); + this.registry.previousInputMethods = this.registry.previousInputMethods.slice( 0, 5 ); + } }, // Return the last used or the default IM for language @@ -1396,10 +1419,6 @@ 'he-standard-2012-extonly': { name: 'עברית עם ניקוד', source: 'rules/he/he-standard-2012-extonly.js' - }, - 'he-kbd': { - name: 'כבד', - source: 'rules/he/he-kbd.js' }, 'hr-kbd': { name: 'Croatian kbd', @@ -1782,7 +1801,7 @@ }, 'he': { autonym: 'עברית', - inputmethods: [ 'he-standard-2012-extonly', 'he-standard-2012', 'he-kbd' ] + inputmethods: [ 'he-standard-2012-extonly', 'he-standard-2012' ] }, 'hi': { autonym: 'हिन्दी', diff --git a/lib/jquery.ime/rules/he/he-kbd.js b/lib/jquery.ime/rules/he/he-kbd.js deleted file mode 100644 index 8cf1e9a..0000000 --- a/lib/jquery.ime/rules/he/he-kbd.js +++ /dev/null @@ -1,58 +0,0 @@ -( function ( $ ) { - 'use strict'; - - var heKbd = { - id: 'he-kbd', - name: 'Hebrew kbd', - description: 'Hebrew kbd keyboard layout', - date: '2013-02-11', - URL: 'http://github.com/wikimedia/jquery.ime', - author: 'Parag Nemade', - license: 'GPLv3', - version: '1.0', - patterns: [ - ['\\`', ';'], - ['q', '/'], - ['w', '\''], - ['e', 'ק'], - ['r', 'ר'], - ['t', 'א'], - ['y', 'ט'], - ['u', 'ו'], - ['i', 'ן'], - ['o', 'ם'], - ['p', 'פ'], - ['a', 'ש'], - ['s', 'ד'], - ['d', 'ג'], - ['f', 'כ'], - ['g', 'ע'], - ['h', 'י'], - ['j', 'ח'], - ['k', 'ל'], - ['l', 'ך'], - [';', 'ף'], - ['z', 'ז'], - ['x', 'ס'], - ['c', 'ב'], - ['v', 'ה'], - ['b', 'נ'], - ['n', 'מ'], - ['m', 'צ'], - [',', 'ת'], - ['.', 'ץ'], - ['/', '.'], - ['\'', ','], - ['\\(', ')'], - ['\\)', '('], - ['\\<', '>'], - ['\\>', '<'], - ['\\[', ']'], - ['\\]', '['], - ['\\{', '}'], - ['\\}', '{']] - - }; - $.ime.register( heKbd ); - -}( jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/72093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3755581136cca9958e31b20694c4285c14646c38 Gerrit-PatchSet: 4 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
