jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Upstream: https://github.com/wikimedia/jquery.ime Changes: * hi-inscript: Fixed incorrectly mapped Devanagari letter TTHA * ml-inscript: Correct the mapping of ഠ * or-inscript: fix mapping of Oriya letters TTA and TTHA * Remove unwanted escape for double quotes from rules files * Remove prefixed border-radius rules * Avoid JavaSript error while trying to get autonym * Rules loading: Use $.ajax to cache the rule js file Change-Id: I49b88551263434a93b600278d665e80737edb555 --- M lib/jquery.ime/css/jquery.ime.css M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/README.md M lib/jquery.ime/rules/gu/gu-inscript.js M lib/jquery.ime/rules/hi/hi-inscript.js M lib/jquery.ime/rules/kn/kn-inscript.js M lib/jquery.ime/rules/ml/ml-inscript.js M lib/jquery.ime/rules/mr/mr-inscript.js M lib/jquery.ime/rules/ne/ne-inscript.js M lib/jquery.ime/rules/or/or-inscript.js M lib/jquery.ime/rules/pa/pa-inscript.js M lib/jquery.ime/rules/ta/ta-99.js 12 files changed, 20 insertions(+), 18 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.ime/css/jquery.ime.css b/lib/jquery.ime/css/jquery.ime.css index e15d353..9a254cc 100644 --- a/lib/jquery.ime/css/jquery.ime.css +++ b/lib/jquery.ime/css/jquery.ime.css @@ -97,8 +97,6 @@ padding: 0; border: 1px solid #888; background-color: #FFFFFF; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index c244df4..26577b2 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20140220 +/*! jquery.ime - v0.1.0+20140408 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2014 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -320,9 +320,11 @@ } debug( 'Loading ' + inputmethodId ); - deferred = $.getScript( - ime.options.imePath + $.ime.sources[inputmethodId].source - ).done( function () { + deferred = $.ajax( { + url: ime.options.imePath + $.ime.sources[inputmethodId].source, + dataType: 'script', + cache: true + } ).done( function () { debug( inputmethodId + ' loaded' ); } ).fail( function ( jqxhr, settings, exception ) { debug( 'Error in loading inputmethod ' + inputmethodId + ' Exception: ' + exception ); @@ -1149,7 +1151,8 @@ * @return {string} The autonym */ getAutonym: function ( languageCode ) { - return $.ime.languages[languageCode].autonym; + return $.ime.languages[languageCode] + && $.ime.languages[languageCode].autonym; }, /** diff --git a/lib/jquery.ime/rules/README.md b/lib/jquery.ime/rules/README.md index b314bf4..6197920 100644 --- a/lib/jquery.ime/rules/README.md +++ b/lib/jquery.ime/rules/README.md @@ -23,7 +23,8 @@ author: An optional string containing the authors name. Can contain email address as well. eg: "Santhosh Thottingal, <santhosh.thottin...@gmail.com>" -URL: An optional string containing URL for the original input method definition. +URL: A mandatory string containing URL for source where keyboard is defined, +information about trademark restrictions if any, layout and help. license: An optional string containing licence information. Eg: "CC-BY-SA" or "GPLv3". diff --git a/lib/jquery.ime/rules/gu/gu-inscript.js b/lib/jquery.ime/rules/gu/gu-inscript.js index 75b1bbc..ac1a8cb 100644 --- a/lib/jquery.ime/rules/gu/gu-inscript.js +++ b/lib/jquery.ime/rules/gu/gu-inscript.js @@ -37,7 +37,7 @@ ['P', '\u0A9D'], ['\\}', '\u0A9E'], ['\'', '\u0A9F'], - ['\"', '\u0AA0'], + ['"', '\u0AA0'], ['\\[', '\u0AA1'], ['\\{', '\u0AA2'], ['C', '\u0AA3'], diff --git a/lib/jquery.ime/rules/hi/hi-inscript.js b/lib/jquery.ime/rules/hi/hi-inscript.js index 8138c46..9e46276 100644 --- a/lib/jquery.ime/rules/hi/hi-inscript.js +++ b/lib/jquery.ime/rules/hi/hi-inscript.js @@ -39,7 +39,7 @@ [ 'P', '\u091D' ], [ '\\}', '\u091E' ], [ '\'', '\u091F' ], - [ '\'', '\u0920' ], + [ '"', '\u0920' ], [ '\\[', '\u0921' ], [ '\\{', '\u0922' ], [ 'C', '\u0923' ], diff --git a/lib/jquery.ime/rules/kn/kn-inscript.js b/lib/jquery.ime/rules/kn/kn-inscript.js index 09ca185..33a0f60 100644 --- a/lib/jquery.ime/rules/kn/kn-inscript.js +++ b/lib/jquery.ime/rules/kn/kn-inscript.js @@ -36,7 +36,7 @@ ['P', '\u0C9D'], ['\\}', '\u0C9E'], ['\'', '', '\u0C9F'], - ['\"', '\u0CA0'], + ['"', '\u0CA0'], ['\\[', '\u0CA1'], ['\\{', '\u0CA2'], ['C', '\u0CA3'], diff --git a/lib/jquery.ime/rules/ml/ml-inscript.js b/lib/jquery.ime/rules/ml/ml-inscript.js index 1672f20..6a72261 100644 --- a/lib/jquery.ime/rules/ml/ml-inscript.js +++ b/lib/jquery.ime/rules/ml/ml-inscript.js @@ -69,7 +69,7 @@ [ ';', 'ച' ], [ ':', 'ഛ' ], [ '\'', 'ട' ], - [ '\'', 'ഠ' ], + [ '"', 'ഠ' ], [ 'z', 'െ' ], [ 'Z', 'എ' ], [ 'x', 'ം' ], diff --git a/lib/jquery.ime/rules/mr/mr-inscript.js b/lib/jquery.ime/rules/mr/mr-inscript.js index fa53aed..315088e 100644 --- a/lib/jquery.ime/rules/mr/mr-inscript.js +++ b/lib/jquery.ime/rules/mr/mr-inscript.js @@ -37,7 +37,7 @@ ['P', '\u091D'], ['\\}', '\u091E'], ['\'', '', '\u091F'], - ['\"', '\u0920'], + ['"', '\u0920'], ['\\[', '\u0921'], ['\\{', '\u0922'], ['C', '\u0923'], diff --git a/lib/jquery.ime/rules/ne/ne-inscript.js b/lib/jquery.ime/rules/ne/ne-inscript.js index 1b3d0a7..80a4af4 100644 --- a/lib/jquery.ime/rules/ne/ne-inscript.js +++ b/lib/jquery.ime/rules/ne/ne-inscript.js @@ -35,7 +35,7 @@ ['P', 'झ'], ['\\}', 'ञ'], ['\'', 'ट'], - ['\"', 'ठ'], + ['"', 'ठ'], ['\\[', '','ड'], ['\\{', '','ढ'], ['C', 'ण'], diff --git a/lib/jquery.ime/rules/or/or-inscript.js b/lib/jquery.ime/rules/or/or-inscript.js index b6ea021..0ea6f80 100644 --- a/lib/jquery.ime/rules/or/or-inscript.js +++ b/lib/jquery.ime/rules/or/or-inscript.js @@ -34,8 +34,8 @@ ['p', '\u0B1C'], ['P', '\u0B1D'], ['\\}', '\u0B1E'], - ['`', '\u0B1F'], - ['~', '\u0B20'], + ['\'', '\u0B1F'], + ['"', '\u0B20'], ['\\[', '\u0B21'], ['\\{', '\u0B22'], ['C', '\u0B23'], diff --git a/lib/jquery.ime/rules/pa/pa-inscript.js b/lib/jquery.ime/rules/pa/pa-inscript.js index bd50349..1ee57c5 100644 --- a/lib/jquery.ime/rules/pa/pa-inscript.js +++ b/lib/jquery.ime/rules/pa/pa-inscript.js @@ -68,7 +68,7 @@ ['l', 'ਤ'], ['\\:', 'ਛ'], ['\\;', 'ਚ'], - ['\\"', 'ਠ'], + ['"', 'ਠ'], ['\'', 'ਟ'], ['Z', 'ੱ'], ['z', 'ੰ'], diff --git a/lib/jquery.ime/rules/ta/ta-99.js b/lib/jquery.ime/rules/ta/ta-99.js index c22dfab..d40c355 100644 --- a/lib/jquery.ime/rules/ta/ta-99.js +++ b/lib/jquery.ime/rules/ta/ta-99.js @@ -164,7 +164,7 @@ [ 'G', 'எ' ], [ 'H', 'க' ], [ 'J', 'ப' ], - [ 'K', '\'' ], + [ 'K', '"' ], [ 'L', ':' ], [ '\\:', ';' ], [ '\'', '\'' ], -- To view, visit https://gerrit.wikimedia.org/r/124628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49b88551263434a93b600278d665e80737edb555 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com> Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
