jenkins-bot has submitted this change and it was merged. Change subject: Update jquery.ime from upstream ......................................................................
Update jquery.ime from upstream Change-Id: I37d3f1e6b0ebff3ddfd46b2c155e4f5fe590cb4b Version: 0.1.0+20130708 --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/mh/mh.js M lib/jquery.ime/rules/or/or-inscript.js M lib/jquery.ime/rules/or/or-inscript2.js M lib/jquery.ime/rules/or/or-phonetic.js M lib/jquery.ime/rules/or/or-transliteration.js 6 files changed, 54 insertions(+), 34 deletions(-) Approvals: Amire80: 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 7286fef..9bf7cc8 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.1.0+20130707 +/*! jquery.ime - v0.1.0+20130708 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ ( function ( $ ) { @@ -486,7 +486,7 @@ var selectorTemplate, MutationObserver; - function IMESelector ( element, options ) { + function IMESelector( element, options ) { this.$element = $( element ); this.options = $.extend( {}, IMESelector.defaults, options ); this.active = false; @@ -508,20 +508,24 @@ }, 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 = $( '<div class="imeselector-menu" role="menu">' ); - this.$menu.append( imeListTitle() ) - .append( imeList() ) - .append( toggleMenuItem() ) - .append( languageListTitle() ); + this.$menu.append( + imeListTitle(), + imeList(), + toggleMenuItem(), + languageListTitle() + ); + this.prepareLanguageList(); this.$menu.append( this.helpLink() ); + if ( $.i18n ) { this.$menu.i18n(); } + this.$imeSetting.append( this.$menu ); $( 'body' ).append( this.$imeSetting ); }, @@ -551,7 +555,8 @@ imeselector.$imeSetting.css( 'opacity', 1 ); imeselector.$imeSetting.css( 'margin-top', 0 ); } ); - }, 2500 ); + }, 2500 + ); }, focus: function () { @@ -597,6 +602,7 @@ if ( t.hasClass( 'imeselector-toggle' ) ) { imeselector.toggle(); } + return false; } ); @@ -619,22 +625,31 @@ imeselector.$menu.on( 'click.ime', 'li', function() { imeselector.$element.focus(); + return false; } ); imeselector.$menu.on( 'click.ime', 'li.ime-im', function () { imeselector.selectIM( $( this ).data( 'ime-inputmethod' ) ); + return false; } ); imeselector.$menu.on( 'click.ime', 'li.ime-lang', function () { imeselector.selectLanguage( $( this ).attr( 'lang' ) ); + return false; } ); imeselector.$menu.on( 'click.ime', 'div.ime-disable', function () { imeselector.disableIM(); + return false; + } ); + + // Just make it work as a regular link + imeselector.$menu.on( 'click.ime', '.ime-help-link', function ( e ) { + e.stopPropagation(); } ); imeselector.$element.on( 'focus.ime', function ( e ) { @@ -683,10 +698,12 @@ } else { languageCode = this.decideLanguage(); this.selectLanguage( languageCode ); + if ( !ime.isActive() && $.ime.languages[languageCode] ) { // Even after pressing toggle shortcut again, it is still disabled // Check if there is a previously used input method. previousInputMethods = $.ime.preferences.getPreviousInputMethods(); + if ( previousInputMethods[0] ) { this.selectIM( previousInputMethods[0] ); } else { @@ -812,9 +829,8 @@ /** * Decide on initial language to select - * */ - decideLanguage : function () { + decideLanguage: function () { if ( $.ime.preferences.getLanguage() ) { // There has been an override by the user, // so return the language selected by user @@ -824,7 +840,7 @@ if ( this.$element.attr('lang' ) && $.ime.languages[ this.$element.attr( 'lang' ) ] ) { - return this.$element.attr( 'lang' ); + return this.$element.attr( 'lang' ); } // There is either no IMs for the given language attr @@ -892,7 +908,7 @@ * Prepare language list */ prepareLanguageList: function () { - var languageCodeIndex = 0, + var languageCodeIndex, $languageListWrapper, $languageList, languageList, @@ -950,8 +966,12 @@ $imeItem = $( '<a>' ).attr( 'href', '#' ).text( name ), $inputMethod = $( '<li data-ime-inputmethod=' + inputmethod + '>' ); - $inputMethod.append( '<span class="ime-im-check">' ).append( $imeItem ); - $inputMethod.addClass( 'ime-im' ); + $inputMethod + .append( + '<span class="ime-im-check">', + $imeItem + ) + .addClass( 'ime-im' ); $imeList.append( $inputMethod ); } ); }, @@ -993,33 +1013,33 @@ $.fn.imeselector.Constructor = IMESelector; - function languageListTitle () { + function languageListTitle() { return $( '<h3>' ) .addClass( 'ime-lang-title' ) .attr( 'data-i18n', 'jquery-ime-other-languages' ) .text( 'Other languages' ); } - function imeList () { + function imeList() { return $( '<ul>' ).addClass( 'ime-list' ); } - function imeListTitle () { + function imeListTitle() { return $( '<h3>' ).addClass( 'ime-list-title' ); } - function toggleMenuItem () { - return $( '<div class="ime-disable">' ) - .append( $( '<span>' ) + function toggleMenuItem() { + return $( '<div class="ime-disable">' ).append( + $( '<span>' ) .attr( { 'class': 'ime-disable-link', 'data-i18n': 'jquery-ime-disable-text' } ) - .text( 'System input method' ) - ).append( $( '<span>' ) + .text( 'System input method' ), + $( '<span>' ) .addClass( 'ime-disable-shortcut' ) .text( 'CTRL+M' ) - ); + ); } selectorTemplate = '<div class="imeselector imeselector-toggle">' + @@ -1036,13 +1056,13 @@ * @param event Event object * @return bool */ - function isShortcutKey ( event ) { + function isShortcutKey( event ) { // 77 - The letter M, for Ctrl-M // 13 - The Enter key return event.ctrlKey && !event.altKey && ( event.which === 77 || event.which === 13 ); } - function isDOMAttrModifiedSupported () { + function isDOMAttrModifiedSupported() { var p = document.createElement( 'p' ), flag = false; @@ -1557,15 +1577,15 @@ source: 'rules/no/no-tildeforms.js' }, 'or-transliteration': { - name: 'ଟରନସଲିତେରତିଓନ', + name: 'ଟ୍ରାନ୍ସଲି ଟରେସନ', source: 'rules/or/or-transliteration.js' }, 'or-inscript': { - name: 'ଈନସକରିପତ', + name: 'ଇନସ୍କ୍ରିପ୍ଟ', source: 'rules/or/or-inscript.js' }, 'or-inscript2': { - name: 'ଈନସକରିପତ2', + name: 'ଇନସ୍କ୍ରିପ୍ଟ2', source: 'rules/or/or-inscript2.js' }, 'or-lekhani': { @@ -1573,7 +1593,7 @@ source: 'rules/or/or-lekhani.js' }, 'or-phonetic': { - name: 'ହୋନେତିକ', + name: 'ଫୋନେଟିକ', source: 'rules/or/or-phonetic.js' }, 'sd-inscript2': { @@ -1917,7 +1937,7 @@ }, 'or': { autonym: 'ଓଡ଼ିଆ', - inputmethods: [ 'or-transliteration', 'or-lekhani', 'or-inscript', 'or-phonetic', 'or-inscript2' ] + inputmethods: [ 'or-phonetic', 'or-transliteration', 'or-inscript', 'or-inscript2', 'or-lekhani' ] }, 'pa': { autonym: 'ਪੰਜਾਬੀ', diff --git a/lib/jquery.ime/rules/mh/mh.js b/lib/jquery.ime/rules/mh/mh.js old mode 100755 new mode 100644 diff --git a/lib/jquery.ime/rules/or/or-inscript.js b/lib/jquery.ime/rules/or/or-inscript.js index b7983cf..d533978 100644 --- a/lib/jquery.ime/rules/or/or-inscript.js +++ b/lib/jquery.ime/rules/or/or-inscript.js @@ -3,7 +3,7 @@ var orInScript = { id: 'or-inscript', - name: 'Odia InScript', + name: 'ଇନସ୍କ୍ରିପ୍ଟ', description: 'InScript keyboard for Odia script', date: '2012-10-14', author: 'Junaid P V', diff --git a/lib/jquery.ime/rules/or/or-inscript2.js b/lib/jquery.ime/rules/or/or-inscript2.js index 3e53fed..12a58e5 100644 --- a/lib/jquery.ime/rules/or/or-inscript2.js +++ b/lib/jquery.ime/rules/or/or-inscript2.js @@ -3,7 +3,7 @@ var orInScript2 = { id: 'or-inscript2', - name: 'InScript2', + name: 'ଇନସ୍କ୍ରିପ୍ଟ2', description: 'Enhanced InScript keyboard for Odia language', date: '2013-02-09', author: 'Parag Nemade', diff --git a/lib/jquery.ime/rules/or/or-phonetic.js b/lib/jquery.ime/rules/or/or-phonetic.js index 4d22446..5ec9e01 100644 --- a/lib/jquery.ime/rules/or/or-phonetic.js +++ b/lib/jquery.ime/rules/or/or-phonetic.js @@ -3,7 +3,7 @@ var orPhonetic = { id: 'or-phonetic', - name: 'Odia Phonetic', + name: 'ଫୋନେଟିକ', description: 'Phonetic keyboard for Odia script', date: '2013-02-09', URL: 'http://github.com/wikimedia/jquery.ime', diff --git a/lib/jquery.ime/rules/or/or-transliteration.js b/lib/jquery.ime/rules/or/or-transliteration.js index ebe39cb..19bbd0a 100644 --- a/lib/jquery.ime/rules/or/or-transliteration.js +++ b/lib/jquery.ime/rules/or/or-transliteration.js @@ -4,7 +4,7 @@ var orTransliteration = { id: 'or-transliteration', name: 'Odia Transliteration', - description: 'Odia transliteration', + description: 'ଟ୍ରାନ୍ସଲି ଟରେସନ', date: '2012-10-14', URL: 'http://github.com/wikimedia/jquery.ime', author: 'Junaid P V and Subhashish Panigrahi', -- To view, visit https://gerrit.wikimedia.org/r/72492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37d3f1e6b0ebff3ddfd46b2c155e4f5fe590cb4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
