Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/70595
Change subject: Update IME from upstream ...................................................................... Update IME from upstream I tested to see that this fixes Bug: 49679 Change-Id: I1bc5a4ac2788d20d2bdba6454bd278a3b4681168 --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/my/my-kbd.js M lib/jquery.ime/rules/my/my-xkb.js 3 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/95/70595/1 diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index f252ba5..f050bdf 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/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(); - this.$menu - .addClass( 'position-top' ) - .css( 'top', - - ( 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', -menutop ); + } } this.$element.parents().each( function() { diff --git a/lib/jquery.ime/rules/my/my-kbd.js b/lib/jquery.ime/rules/my/my-kbd.js index 1f7c763..dec7d45 100644 --- a/lib/jquery.ime/rules/my/my-kbd.js +++ b/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 ) ); - diff --git a/lib/jquery.ime/rules/my/my-xkb.js b/lib/jquery.ime/rules/my/my-xkb.js index 2959b00..78a2dfb 100644 --- a/lib/jquery.ime/rules/my/my-xkb.js +++ b/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 ) ); - -- To view, visit https://gerrit.wikimedia.org/r/70595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bc5a4ac2788d20d2bdba6454bd278a3b4681168 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
