jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Change-Id: Iac3c14f82c982396c4bcecfb3c5cc97df82c41cb Version: 0.1.0+20130531 --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/be/be-kbd.js D lib/jquery.ime/rules/bn/bn-nasir.js D lib/jquery.ime/rules/en/capitalize.js R lib/jquery.ime/rules/gom/gom-inscript2.js M lib/jquery.ime/rules/hr/hr-kbd.js M lib/jquery.ime/rules/lo/lo-kbd.js M lib/jquery.ime/rules/mh/mh.js D lib/jquery.ime/rules/ru/ru-transliteration.js D lib/jquery.ime/rules/ua/ua-kbd.js A lib/jquery.ime/rules/udm/udm-alt.js M lib/jquery.ime/rules/uk/uk-kbd.js M lib/jquery.ime/rules/uz/uz-kbd.js 13 files changed, 75 insertions(+), 294 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 f969fcb..437f916 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20130522 +/*! jquery.ime - v0.1.0+20130531 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -772,9 +772,8 @@ 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' + if ( ime.inputmethod && ime.inputmethod.id === imePref + || imePref === 'system' ) { return false; } @@ -823,6 +822,10 @@ var imeselector = this, ime; + if ( !inputmethodId ) { + return; + } + this.$menu.find( '.checked' ).removeClass( 'checked' ); this.$menu.find( 'li.ime-disable' ).removeClass( 'checked' ); this.$menu.find( 'li[data-ime-inputmethod=' + inputmethodId + ']' ) @@ -832,10 +835,6 @@ if ( inputmethodId === 'system' ) { this.disableIM(); - return; - } - - if ( !inputmethodId ) { return; } @@ -1136,7 +1135,9 @@ if ( !this.registry.imes ) { this.registry.imes = {}; } - return this.registry.imes[language] || $.ime.languages[language].inputmethods[0]; + return this.registry.imes[language] || + ( $.ime.languages[language] && + $.ime.languages[language].inputmethods[0] ); }, save: function () { @@ -1435,9 +1436,9 @@ name: 'KGP/Nudi/KP Rao', source: 'rules/kn/kn-kgp.js' }, - 'kok-inscript2': { + 'gom-inscript2': { name: 'इनस्क्रिप्ट २', - source: 'rules/kok/kok-inscript2.js' + source: 'rules/gom/gom-inscript2.js' }, 'ks-inscript': { name: 'इनस्क्रिप्ट', @@ -1639,6 +1640,10 @@ name: 'International Phonetic Alphabet - SIL', source: 'rules/fonipa/ipa-sil.js' }, + 'udm-alt': { + name: 'Удмурт ALT', + source: 'rules/udm/udm-alt.js' + }, 'uk-kbd': { name: 'кбд', source: 'rules/uk/uk-kbd.js' @@ -1740,7 +1745,7 @@ }, 'gom': { autonym: 'कोंकणी', - inputmethods: [ 'hi-transliteration', 'hi-inscript' ] + inputmethods: [ 'hi-transliteration', 'hi-inscript', 'gom-inscript2' ] }, 'gu': { autonym: 'ગુજરાતી', @@ -1801,10 +1806,6 @@ 'kab': { autonym: 'ⵜⴰⵇⴱⴰⵢⵍⵉⵜ', inputmethods: [ 'ber-tfng' ] - }, - 'kok': { - autonym: 'कोंकणी', - inputmethods: [ 'kok-inscript2' ] }, 'lbe': { autonym: 'лакку', @@ -1946,6 +1947,10 @@ autonym: 'ⵜⴰⵎⴰⵣⵉⵖⵜ', inputmethods: [ 'ber-tfng' ] }, + 'udm': { + autonym: 'удмурт', + inputmethods: [ 'udm-alt' ] + }, 'uk': { autonym: 'Українська', inputmethods: [ 'uk-kbd' ] diff --git a/lib/jquery.ime/rules/be/be-kbd.js b/lib/jquery.ime/rules/be/be-kbd.js index abf1d30..6652fd7 100644 --- a/lib/jquery.ime/rules/be/be-kbd.js +++ b/lib/jquery.ime/rules/be/be-kbd.js @@ -69,8 +69,8 @@ ['I', 'Ш'], ['O', 'Ў'], ['P', 'З'], - ['{', 'Х'], - ['}', '\''], + ['\\{', 'Х'], + ['\\}', '\''], ['A', 'Ф'], ['S', 'Ы'], ['D', 'В'], diff --git a/lib/jquery.ime/rules/bn/bn-nasir.js b/lib/jquery.ime/rules/bn/bn-nasir.js deleted file mode 100644 index 907b099..0000000 --- a/lib/jquery.ime/rules/bn/bn-nasir.js +++ /dev/null @@ -1,47 +0,0 @@ -( function ( $ ) { - 'use strict'; - - function transVowel ( input ) { - switch (input) { - case 's': - return 'ে'; - // XXX Rest of the vowel rules - } - return input; - } - - function transConsonant ( input ) { - switch (input) { - case 'k': - return 'ক'; - case 'l': - return 'ত'; - // XXX Rest of the consonant rules - } - return input; - } - - var bnNasir = { - id: 'bn-nasir', - name: 'Bengali Nasir keyboard', - description: 'Bengali Nasir input method', - contextLength: 1, - maxKeyLength: 2, - patterns: [ - // Independent vowel transliteration - [ '([efrgtswaqt])', function ( $1, $2 ) { - return transVowel( $1 ); - } ], - // Prebase vowel sign + consonant transliteration - [ '([িুেো])([a-z])', function ( $1, $2, $3 ) { - return transConsonant( $3 ) + $2; - } ], - // consonant transliteration - [ '([klmnopuv])', function ( $1, $2 ) { - return transConsonant( $2 ); - } ] - ] - }; - $.ime.register( bnNasir ); - -}( jQuery ) ); diff --git a/lib/jquery.ime/rules/en/capitalize.js b/lib/jquery.ime/rules/en/capitalize.js deleted file mode 100644 index 7c092ab..0000000 --- a/lib/jquery.ime/rules/en/capitalize.js +++ /dev/null @@ -1,20 +0,0 @@ -( function ( $ ) { - 'use strict'; - - var capitalize = { - id: 'en-capitalize', - name: 'English Capitalize', - description: 'Capitalize all the letters', - date: '2012-10-03', - URL: 'http://github.com/wikimedia/jquery.ime', - author: 'Santhosh Thottingal', - license: 'CC-BY-SA', - version: '1.0', - patterns: [ [ '[a-z]', function ( $1 ) { - return $1.toUpperCase(); - } ] ] - }; - - $.ime.register( capitalize ); - -}( jQuery ) ); diff --git a/lib/jquery.ime/rules/kok/kok-inscript2.js b/lib/jquery.ime/rules/gom/gom-inscript2.js similarity index 96% rename from lib/jquery.ime/rules/kok/kok-inscript2.js rename to lib/jquery.ime/rules/gom/gom-inscript2.js index d1c6952..49d8aee 100644 --- a/lib/jquery.ime/rules/kok/kok-inscript2.js +++ b/lib/jquery.ime/rules/gom/gom-inscript2.js @@ -1,8 +1,8 @@ ( function ( $ ) { 'use strict'; - var kokInScript2 = { - id: 'kok-inscript2', + var gomInScript2 = { + id: 'gom-inscript2', name: 'कोंकणी इनस्क्रिप्ट २', description: 'Enhanced InScript keyboard for Kokani language', date: '2012-11-06', @@ -115,5 +115,5 @@ ] }; - $.ime.register( kokInScript2 ); + $.ime.register( gomInScript2 ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/hr/hr-kbd.js b/lib/jquery.ime/rules/hr/hr-kbd.js index 48c42a3..82fe519 100644 --- a/lib/jquery.ime/rules/hr/hr-kbd.js +++ b/lib/jquery.ime/rules/hr/hr-kbd.js @@ -26,7 +26,7 @@ ['\\@', '\"'], ['\\^', '&'], ['\\&', '/'], - ['*', '('], + ['\\*', '('], ['\\(', ')'], ['\\)', '='], ['\\-', '\''], diff --git a/lib/jquery.ime/rules/lo/lo-kbd.js b/lib/jquery.ime/rules/lo/lo-kbd.js index 3358b12..093bc82 100644 --- a/lib/jquery.ime/rules/lo/lo-kbd.js +++ b/lib/jquery.ime/rules/lo/lo-kbd.js @@ -103,7 +103,7 @@ ['\\{', '-'], ['\\|', 'ຫຼ'], ['\\}', '/'], - ['\\~', ''], + ['~', '໌'], ['\\\\', '\\'], ['0', '໐'], ['1', '໑'], diff --git a/lib/jquery.ime/rules/mh/mh.js b/lib/jquery.ime/rules/mh/mh.js old mode 100644 new mode 100755 diff --git a/lib/jquery.ime/rules/ru/ru-transliteration.js b/lib/jquery.ime/rules/ru/ru-transliteration.js deleted file mode 100644 index f9b238b..0000000 --- a/lib/jquery.ime/rules/ru/ru-transliteration.js +++ /dev/null @@ -1,96 +0,0 @@ -( function ( $ ) { - 'use strict'; - - var ruTransliteration = { - id: 'ru-transliteration', - name: 'Russian Transliteration', - description: 'Russian transliteration', - date: '2012-10-16', - URL: 'http://github.com/wikimedia/jquery.ime', - author: 'Amir (Алексей) Aharoni', - 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', 'Ь'], - ['<', 'Б'], - ['>', 'Ю'], - ['\\?', ','], - - ['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', 'ь'], - [',', 'б'], - ['\\.', 'ю'], - ['/', '.'], - - ['`', 'ё'], - ['~', 'Ё'], - - // ! is the same // 1 - ['@', '"'], // 2 - ['#', '№'], // 3 - ['\\$', ';'], // 4 - // '%' is the same // 5 - ['^', ':'], // 6 - ['&', '?']] // 7 - // '*', '(' and ')' are the same // 8, 9, 0 - }; - $.ime.register( ruTransliteration ); - -}( jQuery ) ); diff --git a/lib/jquery.ime/rules/ua/ua-kbd.js b/lib/jquery.ime/rules/ua/ua-kbd.js deleted file mode 100644 index 21a4544..0000000 --- a/lib/jquery.ime/rules/ua/ua-kbd.js +++ /dev/null @@ -1,102 +0,0 @@ -( function ( $ ) { - 'use strict'; - - var uaKbd = { - id: 'ua-kbd', - name: 'Ukrarian kbd', - description: 'Ukrainian kbd keyboard layout', - date: '2013-02-12', - 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', 'ь'], - [',', 'б'], - ['.', 'ю'], - ['/', '.'], - ['\\!', '!'], - ['\\@', '"'], - ['\\#', '№'], - ['\\$', ';'], - ['\\%', '%'], - ['\\^', ':'], - ['\\&', '?'], - ['\\*', '*'], - ['\\(', '('], - ['\\)', ')'], - ['\\_', '_'], - ['\\+', '+'], - ['\\~', 'Ґ'], - ['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( uaKbd ); - -}( jQuery ) ); - diff --git a/lib/jquery.ime/rules/udm/udm-alt.js b/lib/jquery.ime/rules/udm/udm-alt.js new file mode 100644 index 0000000..71a1c29 --- /dev/null +++ b/lib/jquery.ime/rules/udm/udm-alt.js @@ -0,0 +1,41 @@ +( function ( $ ) { + 'use strict'; + + var udmAlt = { + id: 'udm-alt', + name: 'Удмурт ALT', + description: 'Удмурт ALT', + date: '2013-03-17', + URL: 'http://github.com/wikimedia/jquery.ime', + author: 'Amir (Алексей) Aharoni', + license: 'GPLv3', + version: '1.0', + patterns: [ + ['ц', 'ӵ'], + ['Ц', 'Ӵ'], + ['щ', 'ӥ'], + ['Щ', 'Ӥ'], + ['х', 'ӟ'], + ['Х', 'Ӟ'], + ['ф', 'ӝ'], + ['Ф', 'Ӝ'] + ], + + patterns_x: [ + ['ё', 'ӧ'], + ['Ё', 'Ӧ'], + + // Allow typing the Russian letters using Alt + ['ц', 'ц'], + ['Ц', 'Ц'], + ['щ', 'щ'], + ['Щ', 'Щ'], + ['х', 'х'], + ['Х', 'Х'], + ['ф', 'ф'], + ['Ф', 'Ф'] + ] + }; + $.ime.register( udmAlt ); +}( jQuery ) ); + diff --git a/lib/jquery.ime/rules/uk/uk-kbd.js b/lib/jquery.ime/rules/uk/uk-kbd.js index 4f6139d..a102b17 100644 --- a/lib/jquery.ime/rules/uk/uk-kbd.js +++ b/lib/jquery.ime/rules/uk/uk-kbd.js @@ -22,8 +22,8 @@ ['i', 'ш'], ['o', 'щ'], ['p', 'з'], - ['[', 'х'], - [']', 'ї'], + ['\\[', 'х'], + ['\\]', 'ї'], ['a', 'ф'], ['s', 'і'], ['d', 'в'], diff --git a/lib/jquery.ime/rules/uz/uz-kbd.js b/lib/jquery.ime/rules/uz/uz-kbd.js index c13b58d..c568c35 100644 --- a/lib/jquery.ime/rules/uz/uz-kbd.js +++ b/lib/jquery.ime/rules/uz/uz-kbd.js @@ -71,8 +71,8 @@ ['I', 'Ш'], ['O', 'Ў'], ['P', 'З'], - ['{', 'Х'], - ['}', 'Ъ'], + ['\\{', 'Х'], + ['\\}', 'Ъ'], ['A', 'Ф'], ['S', 'Қ'], ['D', 'В'], @@ -92,8 +92,8 @@ ['B', 'И'], ['N', 'Т'], ['M', 'Ь'], - ['<', 'Б'], - ['>', 'Ю'], + ['\\<', 'Б'], + ['\\>', 'Ю'], ['\\?', ','] ] }; -- To view, visit https://gerrit.wikimedia.org/r/66242 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac3c14f82c982396c4bcecfb3c5cc97df82c41cb Gerrit-PatchSet: 1 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: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
