jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Adds support for specifying the input method menu header text. Change-Id: I4c0b8c4879ef49b58a4c897b9131dbfddea524f0 --- M lib/jquery.ime/jquery.ime.js 1 file changed, 32 insertions(+), 10 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index 852a10f..8b14be8 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20130822 +/*! jquery.ime - v0.1.0+20130826 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -1053,15 +1053,15 @@ * @return {string|bool} Selected input method id or false */ selectLanguage: function ( languageCode ) { - var ime, + var ime = this.$element.data( 'ime' ), imePref = $.ime.preferences.getIM( languageCode ), language = $.ime.languages[languageCode]; + + this.setMenuTitle( this.getAutonym( languageCode ) ); if ( !language ) { return false; } - - ime = this.$element.data( 'ime' ); if ( ime.getLanguage() === languageCode ) { // Nothing to do. It is same as the current language, @@ -1076,7 +1076,6 @@ this.$menu.find( 'li.ime-lang' ).show(); this.$menu.find( 'li[lang=' + languageCode + ']' ).hide(); - this.$menu.find( '.ime-list-title' ).text( language.autonym ); this.prepareInputMethods( languageCode ); this.hide(); // And select the default inputmethod @@ -1085,6 +1084,25 @@ this.selectIM( $.ime.preferences.getIM( languageCode ) ); return $.ime.preferences.getIM( languageCode ); + }, + + /** + * Get the autonym by language code. + * + * @param {string} languageCode + * @return {string} The autonym + */ + getAutonym: function ( languageCode ) { + return $.ime.languages[languageCode].autonym; + }, + + /** + * Set the title of the selector menu. + * + * @param {string} title + */ + setMenuTitle: function ( title ) { + this.$menu.find( '.ime-list-title' ).text( title ); }, /** @@ -1111,7 +1129,7 @@ /** * Select an input method * - * @param inputmethodId + * @param {string} inputmethodId */ selectIM: function ( inputmethodId ) { var imeselector = this, @@ -1198,7 +1216,7 @@ $languageItem = $( '<a>' ) .attr( 'href', '#' ) - .text( language.autonym ) + .text( this.getAutonym( languageCode ) ) .addClass( 'selectable-row-item' ); $language = $( '<li class="ime-lang selectable-row">' ).attr( 'lang', languageCode ); $language.append( $languageItem ); @@ -1216,7 +1234,7 @@ /** * Prepare input methods in menu for the given language code * - * @param {String} languageCode + * @param {string} languageCode */ prepareInputMethods: function ( languageCode ) { var language = $.ime.languages[languageCode], @@ -1247,6 +1265,10 @@ } ); }, + /** + * Create a help link element. + * @return {jQuery} + */ helpLink: function () { return $( '<div class="ime-help-link selectable-row">' ) .append( $( '<a>' ).text( 'Help' ) @@ -1325,8 +1347,8 @@ /** * Check whether a keypress event corresponds to the shortcut key * - * @param event Event object - * @return bool + * @param {event} event + * @return {bool} true if the key is a shortcut key */ function isShortcutKey( event ) { // 77 - The letter M, for Ctrl-M -- To view, visit https://gerrit.wikimedia.org/r/80969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c0b8c4879ef49b58a4c897b9131dbfddea524f0 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
