Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/52777
Change subject: Update jquery.ime from upstream ...................................................................... Update jquery.ime from upstream * Fixes bug 44992 * Improvements to click event handling Change-Id: I2146340051b937cb51e7f296fd947262c781d712 --- M lib/jquery.ime/jquery.ime.js 1 file changed, 18 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/77/52777/1 diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index 40e4ed3..2d82400 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0 - 2013-03-06 +/*! jquery.ime - v0.1.0 - 2013-03-08 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -536,8 +536,9 @@ }, focus: function () { - // Hide all other IME settings + // Hide all other IME settings and collapse open menus $( 'div.imeselector' ).hide(); + $( 'div.imeselector-menu' ).removeClass( 'open' ); this.$imeSetting.show(); this.resetTimer(); }, @@ -555,16 +556,24 @@ return false; }, + toggle: function () { + if ( this.$menu.hasClass( 'open' ) ) { + this.hide(); + } else { + this.show(); + } + }, + /** * Bind the events and listen */ listen: function () { var imeselector = this; - $( 'html' ).on( 'click.ime', function () { - imeselector.hide(); - if ( imeselector.$element.is( ':hidden' ) ) { - imeselector.$imeSetting.hide(); + imeselector.$imeSetting.on( 'click.ime', function ( e ) { + var t = $( e.target ); + if ( t.hasClass( 'imeselector-toggle' ) ) { + imeselector.toggle(); } } ); @@ -604,8 +613,6 @@ e.stopPropagation(); e.preventDefault(); } ); - - imeselector.$imeSetting.on( 'click.ime', $.proxy( this.show, this ) ); imeselector.$element.on( 'focus.ime', function ( e ) { imeselector.selectLanguage( imeselector.decideLanguage() ); @@ -667,7 +674,7 @@ - this.$imeSetting.outerWidth(); room = $( window ).height() - top; if ( room < this.$imeSetting.outerHeight() ) { - top = top - this.$imeSetting.outerHeight(); + top = position.top - this.$imeSetting.outerHeight(); this.$menu.css( 'top', - ( this.$menu.outerHeight() + @@ -927,9 +934,9 @@ ); } - var selectorTemplate = '<div class="imeselector">' + var selectorTemplate = '<div class="imeselector imeselector-toggle">' + '<a class="ime-name imeselector-toggle" href="#"></a>' - + '<b class="ime-setting-caret"></b></div>', + + '<b class="ime-setting-caret imeselector-toggle"></b>', MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver; -- To view, visit https://gerrit.wikimedia.org/r/52777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2146340051b937cb51e7f296fd947262c781d712 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
