From a628b1c7053b9fc6304946e7c060cba3c858af98 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Wed, 15 Jul 2020 18:25:57 +0100 Subject: [PATCH] Update jquery.ime Change-Id: Ibcf7a4f076ceb86b91e81310bcb2fa64abc551dd --- lib/jquery.ime/jquery.ime.js | 197 ++++++++----------------- lib/jquery.ime/rules/or/or-inscript.js | 2 +- 2 files changed, 61 insertions(+), 138 deletions(-) diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index b4b8d8c0..7c88391f 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.2.0+20200614 +/*! jquery.ime - v0.2.0+20200724 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2020 Santhosh Thottingal; License: (GPL-2.0-or-later OR MIT) */ ( function ( $ ) { @@ -7,11 +7,9 @@ var TextEntryFactory, TextEntry, FormWidgetEntry, ContentEditableEntry, defaultInputMethod; - // rangy is defined in the rangy library - /* global rangy */ - /** * private function for debugging + * * @param {jQuery} [$obj] */ function debug( $obj ) { @@ -48,7 +46,7 @@ /** * IME Class * - * @class + * @class IME * @constructor * @param {HTMLElement} element Element on which to listen for events * @param {TextEntry} textEntry Text entry object to use to get/set text @@ -75,6 +73,10 @@ this.language = null; this.context = ''; if ( this.options.showSelector ) { + this.options.selectorInside = options.selectorInside !== undefined ? + options.selectorInside : + // eslint-disable-next-line no-jquery/no-class-state + this.$element.hasClass( 'ime-position-inside' ); this.selector = this.$element.imeselector( this.options ); } this.listen(); @@ -405,7 +407,7 @@ /** * TextEntry factory * - * @class + * @class TextEntryFactory * @constructor */ TextEntryFactory = function IMETextEntryFactory() { @@ -431,17 +433,21 @@ * Wrap an editable element with the appropriate TextEntry class * * @param {jQuery} $element The element to wrap - * @return {TextEntry|undefined} A TextEntry, or undefined if no match + * @return {TextEntry|null} A TextEntry, or null if no match */ TextEntryFactory.prototype.wrap = function ( $element ) { var i, len, TextEntryClass; + // eslint-disable-next-line no-jquery/no-class-state + if ( $element.hasClass( 'noime' ) ) { + return null; + } for ( i = 0, len = this.TextEntryClasses.length; i < len; i++ ) { TextEntryClass = this.TextEntryClasses[ i ]; if ( TextEntryClass.static.canWrap( $element ) ) { return new TextEntryClass( $element ); } } - return undefined; + return null; }; /* Initialization */ @@ -451,7 +457,7 @@ /** * Generic text entry * - * @class + * @class TextEntry * @abstract */ TextEntry = function IMETextEntry() { @@ -496,7 +502,7 @@ /** * TextEntry class for input/textarea widgets * - * @class + * @class FormWidgetEntry * @constructor * @param {jQuery} $element The element to wrap */ @@ -516,9 +522,7 @@ FormWidgetEntry.static.canWrap = function ( $element ) { return $element.is( 'input:not([type]), input[type=text], input[type=search], textarea' ) && !$element.prop( 'readonly' ) && - !$element.prop( 'disabled' ) && - // eslint-disable-next-line no-jquery/no-class-state - !$element.hasClass( 'noime' ); + !$element.prop( 'disabled' ); }; /* Instance methods */ @@ -527,10 +531,10 @@ * @inheritdoc TextEntry */ FormWidgetEntry.prototype.getTextBeforeSelection = function ( maxLength ) { - var pos = this.getCaretPosition(); + var element = this.$element.get( 0 ); return this.$element.val().substring( - Math.max( 0, pos.start - maxLength ), - pos.start + Math.max( 0, element.selectionStart - maxLength ), + element.selectionStart ); }; @@ -538,112 +542,24 @@ * @inheritdoc TextEntry */ FormWidgetEntry.prototype.replaceTextAtSelection = function ( precedingCharCount, newText ) { - var selection, - length, - newLines, - start, - scrollTop, - pos, - element = this.$element.get( 0 ); - - if ( typeof element.selectionStart === 'number' && typeof element.selectionEnd === 'number' ) { - // IE9+ and all other browsers - start = element.selectionStart; + var element = this.$element.get( 0 ), + start = element.selectionStart, scrollTop = element.scrollTop; - // Replace the whole text of the text area: - // text before + newText + text after. - // This could be made better if range selection worked on browsers. - // But for complex scripts, browsers place cursor in unexpected places - // and it's not possible to fix cursor programmatically. - // Ref Bug https://bugs.webkit.org/show_bug.cgi?id=66630 - element.value = element.value.substring( 0, start - precedingCharCount ) + - newText + - element.value.substring( element.selectionEnd, element.value.length ); + // Replace the whole text of the text area: + // text before + newText + text after. + // This could be made better if range selection worked on browsers. + // But for complex scripts, browsers place cursor in unexpected places + // and it's not possible to fix cursor programmatically. + // Ref Bug https://bugs.webkit.org/show_bug.cgi?id=66630 + element.value = element.value.substring( 0, start - precedingCharCount ) + + newText + + element.value.substring( element.selectionEnd, element.value.length ); - // restore scroll - element.scrollTop = scrollTop; - // set selection - element.selectionStart = element.selectionEnd = start - precedingCharCount + newText.length; - } else { - // IE8 and lower - pos = this.getCaretPosition(); - selection = element.createTextRange(); - length = element.value.length; - // IE doesn't count \n when computing the offset, so we won't either - newLines = element.value.match( /\n/g ); - - if ( newLines ) { - length = length - newLines.length; - } - - selection.moveStart( 'character', pos.start - precedingCharCount ); - selection.moveEnd( 'character', pos.end - length ); - - selection.text = newText; - selection.collapse( false ); - selection.select(); - } - }; - - /** - * Get the current selection offsets inside the widget - * - * @return {Object} return Offsets in chars (0 means first offset *or* no selection in widget) - * @return {number} return.start Selection start - * @return {number} return.end Selection end - */ - FormWidgetEntry.prototype.getCaretPosition = function () { - var el = this.$element.get( 0 ), - start = 0, - end = 0, - normalizedValue, - range, - textInputRange, - len, - newLines, - endRange; - - if ( typeof el.selectionStart === 'number' && typeof el.selectionEnd === 'number' ) { - start = el.selectionStart; - end = el.selectionEnd; - } else { - // IE - range = document.selection.createRange(); - - if ( range && range.parentElement() === el ) { - len = el.value.length; - normalizedValue = el.value.replace( /\r\n/g, '\n' ); - newLines = normalizedValue.match( /\n/g ); - - // Create a working TextRange that lives only in the input - textInputRange = el.createTextRange(); - textInputRange.moveToBookmark( range.getBookmark() ); - - // Check if the start and end of the selection are at the very end - // of the input, since moveStart/moveEnd doesn't return what we want - // in those cases - endRange = el.createTextRange(); - endRange.collapse( false ); - - if ( textInputRange.compareEndPoints( 'StartToEnd', endRange ) > -1 ) { - if ( newLines ) { - start = end = len - newLines.length; - } else { - start = end = len; - } - } else { - start = -textInputRange.moveStart( 'character', -len ); - - if ( textInputRange.compareEndPoints( 'EndToEnd', endRange ) > -1 ) { - end = len; - } else { - end = -textInputRange.moveEnd( 'character', -len ); - } - } - } - } - return { start: start, end: end }; + // restore scroll + element.scrollTop = scrollTop; + // set selection + element.selectionStart = element.selectionEnd = start - precedingCharCount + newText.length; }; TextEntryFactory.static.singleton.register( FormWidgetEntry ); @@ -651,7 +567,7 @@ /** * TextEntry class for ContentEditable * - * @class + * @class ContentEditableEntry * @constructor * @param {jQuery} $element The element to wrap */ @@ -669,8 +585,7 @@ * @inheritdoc TextEntry */ ContentEditableEntry.static.canWrap = function ( $element ) { - // eslint-disable-next-line no-jquery/no-class-state - return $element.is( '[contenteditable]' ) && !$element.hasClass( 'noime' ); + return $element.is( '[contenteditable]' ); }; /* Instance methods */ @@ -693,9 +608,11 @@ * @inheritdoc SelectionWrapper */ ContentEditableEntry.prototype.replaceTextAtSelection = function ( precedingCharCount, newText ) { - var range, textNode, textOffset, newOffset, newRange; + var textNode, textOffset, newOffset, newRange, + sel = window.getSelection(), + range = this.getSelectedRange(); - if ( !this.getSelectedRange() ) { + if ( !range ) { return; } @@ -705,12 +622,11 @@ // browsers that do not support it. this.$element.trigger( 'compositionstart' ); - range = this.getSelectedRange(); - if ( !range.collapsed ) { range.deleteContents(); } + newRange = document.createRange(); if ( range.startContainer.nodeType === Node.TEXT_NODE ) { // Alter this text node's content and move the cursor textNode = range.startContainer; @@ -720,10 +636,8 @@ newText + textNode.nodeValue.substr( textOffset ); newOffset = textOffset - precedingCharCount + newText.length; - newRange = rangy.createRange(); newRange.setStart( range.startContainer, newOffset ); newRange.setEnd( range.startContainer, newOffset ); - rangy.getSelection().setSingleRange( newRange ); } else { // XXX assert precedingCharCount === 0 // Insert a new text node with the new text @@ -732,11 +646,11 @@ textNode, range.startContainer.childNodes[ range.startOffset ] ); - newRange = rangy.createRange(); newRange.setStart( textNode, textNode.length ); newRange.setEnd( textNode, textNode.length ); - rangy.getSelection().setSingleRange( newRange ); } + sel.removeAllRanges(); + sel.addRange( newRange ); // Trigger any externally registered jQuery compositionend / input event listeners. // TODO: Try node.dispatchEvent( new CompositionEvent(...) ) so listeners not @@ -752,9 +666,9 @@ * @return {Range|null} The selection range */ ContentEditableEntry.prototype.getSelectedRange = function () { - var sel, range; - rangy.init(); - sel = rangy.getSelection(); + var range, + sel = window.getSelection(); + if ( sel.rangeCount === 0 ) { return null; } @@ -784,7 +698,7 @@ data = $this.data( 'ime' ); if ( !data ) { textEntry = TextEntryFactory.static.singleton.wrap( $this ); - if ( textEntry === undefined ) { + if ( !textEntry ) { return; } data = new IME( this, textEntry, options ); @@ -877,7 +791,8 @@ $.ime.defaults = { languages: [], // Languages to be used- by default all languages helpHandler: null, // Called for each ime option in the menu - showSelector: true + showSelector: true, + selectorInside: undefined // If not set will check if '.ime-position-inside' class is preset }; }( jQuery ) ); @@ -1144,7 +1059,7 @@ /** * Keydown event handler. Handles shortcut key presses * - * @context {HTMLElement} + * @this HTMLElement * @param {jQuery.Event} e * @return {boolean} */ @@ -1215,6 +1130,10 @@ this.$imeSetting.outerWidth(); } + if ( this.options.selectorInside ) { + top -= this.$imeSetting.outerHeight(); + } + // While determining whether to place the selector above or below the input box, // take into account the value of scrollTop, to avoid the selector from always // getting placed above the input box since window.height would be less than top @@ -1223,6 +1142,9 @@ if ( verticalRoom < this.$imeSetting.outerHeight() ) { top = elementPosition.top - this.$imeSetting.outerHeight(); + if ( this.options.selectorInside ) { + top += this.$imeSetting.outerHeight(); + } menuTop = this.$menu.outerHeight() + this.$imeSetting.outerHeight(); @@ -1278,7 +1200,7 @@ * Select a language * * @param {string} languageCode - * @return {string|bool} Selected input method id or false + * @return {string|boolean} Selected input method id or false */ selectLanguage: function ( languageCode ) { var ime, imePref, language; @@ -1341,6 +1263,7 @@ /** * Decide on initial language to select + * * @return {string} */ decideLanguage: function () { diff --git a/lib/jquery.ime/rules/or/or-inscript.js b/lib/jquery.ime/rules/or/or-inscript.js index 04fc9fb8..dba733a8 100644 --- a/lib/jquery.ime/rules/or/or-inscript.js +++ b/lib/jquery.ime/rules/or/or-inscript.js @@ -70,7 +70,7 @@ [ 'q', '\u0B4C' ], [ 'd', '\u0B4D' ], [ '/', '\u0B5F' ], - [ '\\>', '\u0B64' ], + [ '\\>', '\u0964' ], [ '0', '\u0B66' ], [ '1', '\u0B67' ], [ '2', '\u0B68' ],