Merge "Update jquery.ime from upstream"

lib/jquery.ime/jquery.ime.js

@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20130625
+/*! jquery.ime - v0.1.0+20130626
 * https://github.com/wikimedia/jquery.ime
 * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
 ( function ( $ ) {
@@ -704,7 +704,7 @@
 		 */
 		position: function () {
 			var imeSelector = this,
-				position, top, left, room;
+				menutop, position, top, left, room;
 
 			this.focus(); // shows the trigger in case it is hidden
 
@@ -726,13 +726,15 @@
 
 			if ( room < this.$imeSetting.outerHeight() ) {
 				top = position.top - this.$imeSetting.outerHeight();
+				menutop = this.$menu.outerHeight() +
+					this.$imeSetting.outerHeight();
 
+				// Flip the menu to the top only if it can fit in the space there
+				if ( menutop < top ) {
 					this.$menu
 						.addClass( 'position-top' )
-					.css( 'top',
+						.css( 'top', -menutop );
-						- ( this.$menu.outerHeight() +
+				}
-						this.$imeSetting.outerHeight() )
-					);
 			}
 
 			this.$element.parents().each( function() {

lib/jquery.ime/rules/my/my-kbd.js

@@ -3,7 +3,7 @@
 
 	var myKbd = {
 		id: 'my-kbd',
-		name: 'Myanmar kbd',
+		name: 'မြန်မာဘာသာ kbd',
 		description: 'Myanmar kbd keyboard layout',
 		date: '2013-02-12',
 		URL: 'http://github.com/wikimedia/jquery.ime',
@@ -89,4 +89,3 @@
 	$.ime.register( myKbd );
 
 }( jQuery ) );
-

lib/jquery.ime/rules/my/my-xkb.js

@@ -3,7 +3,7 @@
 
 	var myXkb = {
 		id: 'my-xkb',
-		name: 'Myanmar xkb',
+		name: 'မြန်မာဘာသာ xkb',
 		description: 'Myanmar xkb keyboard layout',
 		date: '2013-02-12',
 		URL: 'http://github.com/wikimedia/jquery.ime',
@@ -207,4 +207,3 @@
 	$.ime.register( myXkb );
 
 }( jQuery ) );
-