Merge "Update jquery.ime from upstream"

lib/jquery.ime/css/jquery.ime.css

@@ -97,8 +97,6 @@ span.ime-disable-shortcut {
 	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);

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(
+			deferred = $.ajax( {
-				ime.options.imePath + $.ime.sources[inputmethodId].source
+				url: ime.options.imePath + $.ime.sources[inputmethodId].source,
-			).done( function () {
+				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;
 		},
 
 		/**

lib/jquery.ime/rules/README.md

@@ -23,7 +23,8 @@ Format should be: yyyy-mm-dd
 author: An optional string containing the authors name. Can contain email
 address as well. eg: "Santhosh Thottingal, <santhosh.thottingal@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".

lib/jquery.ime/rules/gu/gu-inscript.js

@@ -37,7 +37,7 @@
 			['P', '\u0A9D'],
 			['\\}', '\u0A9E'],
 			['\'', '\u0A9F'],
-			['\"', '\u0AA0'],
+			['"', '\u0AA0'],
 			['\\[', '\u0AA1'],
 			['\\{', '\u0AA2'],
 			['C', '\u0AA3'],

lib/jquery.ime/rules/hi/hi-inscript.js

@@ -39,7 +39,7 @@
 			[ 'P', '\u091D' ],
 			[ '\\}', '\u091E' ],
 			[ '\'', '\u091F' ],
-			[ '\'', '\u0920' ],
+			[ '"', '\u0920' ],
 			[ '\\[', '\u0921' ],
 			[ '\\{', '\u0922' ],
 			[ 'C', '\u0923' ],

lib/jquery.ime/rules/kn/kn-inscript.js

@@ -36,7 +36,7 @@
 			['P', '\u0C9D'],
 			['\\}', '\u0C9E'],
 			['\'', '', '\u0C9F'],
-			['\"', '\u0CA0'],
+			['"', '\u0CA0'],
 			['\\[', '\u0CA1'],
 			['\\{', '\u0CA2'],
 			['C', '\u0CA3'],

lib/jquery.ime/rules/ml/ml-inscript.js

@@ -69,7 +69,7 @@
 			[ ';', 'ച' ],
 			[ ':', 'ഛ' ],
 			[ '\'', 'ട' ],
-			[ '\'', 'ഠ' ],
+			[ '"', 'ഠ' ],
 			[ 'z', 'െ' ],
 			[ 'Z', 'എ' ],
 			[ 'x', 'ം' ],

lib/jquery.ime/rules/mr/mr-inscript.js

@@ -37,7 +37,7 @@
 			['P', '\u091D'],
 			['\\}', '\u091E'],
 			['\'', '', '\u091F'],
-			['\"', '\u0920'],
+			['"', '\u0920'],
 			['\\[', '\u0921'],
 			['\\{', '\u0922'],
 			['C', '\u0923'],

lib/jquery.ime/rules/ne/ne-inscript.js

@@ -35,7 +35,7 @@
 			['P', 'झ'],
 			['\\}', 'ञ'],
 			['\'', 'ट'],
-			['\"', 'ठ'],
+			['"', 'ठ'],
 			['\\[', '','ड'],
 			['\\{', '','ढ'],
 			['C', 'ण'],

lib/jquery.ime/rules/or/or-inscript.js

@@ -34,8 +34,8 @@
 			['p', '\u0B1C'],
 			['P', '\u0B1D'],
 			['\\}', '\u0B1E'],
-			['`', '\u0B1F'],
+			['\'', '\u0B1F'],
-			['~', '\u0B20'],
+			['"', '\u0B20'],
 			['\\[', '\u0B21'],
 			['\\{', '\u0B22'],
 			['C', '\u0B23'],

lib/jquery.ime/rules/pa/pa-inscript.js

@@ -68,7 +68,7 @@
 			['l', 'ਤ'],
 			['\\:', 'ਛ'],
 			['\\;', 'ਚ'],
-			['\\"', 'ਠ'],
+			['"', 'ਠ'],
 			['\'', 'ਟ'],
 			['Z', 'ੱ'],
 			['z', 'ੰ'],

lib/jquery.ime/rules/ta/ta-99.js

@@ -164,7 +164,7 @@
 			[ 'G', 'எ' ],
 			[ 'H', 'க' ],
 			[ 'J', 'ப' ],
-			[ 'K', '\'' ],
+			[ 'K', '"' ],
 			[ 'L', ':' ],
 			[ '\\:', ';' ],
 			[ '\'', '\'' ],