From b24d629780cf928a774db8d0e772033cec5e3e64 Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Wed, 31 Oct 2012 12:52:16 +0530
Subject: [PATCH] Update jquery.ime from upstream

- Namespaces for events

Change-Id: Ife372ec4fc3b9610c6a04ce5a94aa2b83b9c933e
---
 lib/jquery.ime/jquery.ime.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index a0b7f497..5e0d239c 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -17,7 +17,7 @@
 		constructor: IME,
 
 		listen: function () {
-			this.$element.on( 'keypress', $.proxy( this.keypress, this ) );
+			this.$element.on( 'keypress.ime', $.proxy( this.keypress, this ) );
 		},
 
 		/**
@@ -839,35 +839,35 @@
 		listen: function () {
 			var imeselector = this;
 
-			$( 'html' ).on( 'click', function () {
+			$( 'html' ).on( 'click.ime', function () {
 				imeselector.$menu.removeClass( 'open' );
 			} );
 
-			imeselector.$menu.on( 'click', 'li.ime-im', function ( e ) {
+			imeselector.$menu.on( 'click.ime', 'li.ime-im', function ( e ) {
 				imeselector.selectIM( $( this ).data( 'ime-inputmethod' ) );
 				e.stopPropagation();
 			} );
 
-			imeselector.$menu.on( 'click', 'li.ime-lang', function ( e ) {
+			imeselector.$menu.on( 'click.ime', 'li.ime-lang', function ( e ) {
 				imeselector.selectLanguage( $( this ).attr( 'lang' ) );
 				e.stopPropagation();
 			} );
 
-			imeselector.$menu.on( 'click', 'li.ime-disable-link', function ( e ) {
+			imeselector.$menu.on( 'click.ime', 'li.ime-disable-link', function ( e ) {
 				imeselector.disableIM();
 				e.stopPropagation();
 			} );
 
-			imeselector.$element.on( 'focus', function() {
+			imeselector.$element.on( 'focus.ime', function() {
 				imeselector.selectLanguage( $.ime.preferences.getLanguage() );
 				imeselector.focus( );
 			} );
 
 			// Possible resize of textarea
-			imeselector.$element.on( 'mouseup', $.proxy( this.position, this ) );
-			imeselector.$element.on( 'keydown', $.proxy( this.keydown, this ) );
+			imeselector.$element.on( 'mouseup.ime', $.proxy( this.position, this ) );
+			imeselector.$element.on( 'keydown.ime', $.proxy( this.keydown, this ) );
 
-			imeselector.$imeSetting.on( 'click', $.proxy( this.toggle, this ) );
+			imeselector.$imeSetting.on( 'click.ime', $.proxy( this.toggle, this ) );
 		},
 
 		/**
@@ -916,10 +916,17 @@
 		 * @param languageCode
 		 */
 		selectLanguage: function ( languageCode ) {
+			var language;
+
+			language = $.ime.languages[languageCode];
+
+			if ( !language ) {
+				return false;
+			}
 			this.$menu.find( 'li.ime-lang' ).show();
 			this.$menu.find( 'li[lang=' + languageCode + ']' ).hide();
 
-			this.$menu.find( 'li.ime-list-title' ).text( $.ime.languages[languageCode].autonym );
+			this.$menu.find( 'li.ime-list-title' ).text( language.autonym );
 			this.prepareInputMethods( languageCode );
 			this.$menu.removeClass( 'open' );
 			// And select the default inputmethod
@@ -1178,4 +1185,4 @@
 			// load registry from cookies or localstorage
 		}
 	} );
-}( jQuery ) );
+}( jQuery ) );
\ No newline at end of file