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

Avoid css inheritance for the selector menu.

Change-Id: I407ff816582be9def0e9802a21e8ad06aa0d45ff
---
 lib/jquery.ime/jquery.ime.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 5e0d239c..6cfdd987 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -788,8 +788,8 @@
 		this.$element = $( element );
 		this.options = $.extend( {}, IMESelector.defaults, options );
 		this.active = false;
-		this.$imeSetting = $( selectorTemplate );
-		this.$menu = $( '<ul class="imeselector-menu" role="menu">' );
+		this.$imeSetting = null;
+		this.$menu = null;
 		this.inputmethod = null;
 		this.init();
 		this.listen();
@@ -800,13 +800,16 @@
 
 		init: function () {
 			this.prepareSelectorMenu();
-			this.$imeSetting.append( this.$menu );
-			this.$element.after( this.$imeSetting );
 			this.position();
 			this.$imeSetting.hide();
 		},
 
 		prepareSelectorMenu: function() {
+
+			// TODO: In this approach there is a menu for each editable area.
+			// With correct event mapping we can probably reduce it to one menu.
+			this.$imeSetting = $( selectorTemplate );
+			this.$menu = $( '<ul class="imeselector-menu" role="menu">' );
 			this.$menu.append( imeList() );
 			this.$menu.append( toggleMenuItem() );
 			this.$menu.append( languageListTitle() );
@@ -815,6 +818,8 @@
 			if ( $.i18n ) {
 				this.$menu.i18n();
 			}
+			this.$imeSetting.append( this.$menu );
+			$( 'body' ).append( this.$imeSetting );
 		},
 
 		focus: function ( ) {
@@ -846,28 +851,35 @@
 			imeselector.$menu.on( 'click.ime', 'li.ime-im', function ( e ) {
 				imeselector.selectIM( $( this ).data( 'ime-inputmethod' ) );
 				e.stopPropagation();
+				e.preventDefault();
 			} );
 
 			imeselector.$menu.on( 'click.ime', 'li.ime-lang', function ( e ) {
 				imeselector.selectLanguage( $( this ).attr( 'lang' ) );
 				e.stopPropagation();
+				e.preventDefault();
 			} );
 
 			imeselector.$menu.on( 'click.ime', 'li.ime-disable-link', function ( e ) {
 				imeselector.disableIM();
 				e.stopPropagation();
+				e.preventDefault();
 			} );
 
-			imeselector.$element.on( 'focus.ime', function() {
+			imeselector.$imeSetting.on( 'click.ime', $.proxy( this.toggle, this ) );
+
+			imeselector.$element.on( 'focus.ime', function ( e ) {
 				imeselector.selectLanguage( $.ime.preferences.getLanguage() );
-				imeselector.focus( );
+				imeselector.focus();
+				e.stopPropagation();
 			} );
 
+
 			// Possible resize of textarea
 			imeselector.$element.on( 'mouseup.ime', $.proxy( this.position, this ) );
 			imeselector.$element.on( 'keydown.ime', $.proxy( this.keydown, this ) );
 
-			imeselector.$imeSetting.on( 'click.ime', $.proxy( this.toggle, this ) );
+
 		},
 
 		/**
@@ -903,7 +915,7 @@
 		 * Position the im selector relative to the edit area
 		 */
 		position: function () {
-			var position = this.$element.position();
+			var position = this.$element.offset();
 
 			this.$imeSetting.css( 'top', position.top + this.$element.outerHeight() );
 			this.$imeSetting.css( 'left', position.left + this.$element.outerWidth()