Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js

Issue 1046933003: Updates google-input-tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
index 2856f4f6bc4a08d84e19bc4488d52bd231af3886..dcd6b42632f4626d099a5226717bd7f04aa4c1ee 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
@@ -25,10 +25,12 @@ goog.require('i18n.input.chrome.inputview.content.constants');
goog.require('i18n.input.chrome.inputview.elements.Element');
goog.require('i18n.input.chrome.inputview.elements.ElementType');
goog.require('i18n.input.chrome.inputview.util');
+goog.require('i18n.input.chrome.inputview.handler.Util');
goog.scope(function() {
var ElementType = i18n.input.chrome.inputview.elements.ElementType;
+var Util = i18n.input.chrome.inputview.handler.Util;
/**
@@ -157,6 +159,14 @@ AltDataView.prototype.triggeredBy;
/**
+ * The identifier of PointerEvent which makes this AltDataView visible.
+ *
+ * @type {number}
+ */
+AltDataView.prototype.identifier = Util.INVALID_EVENT_IDENTIFIER;
+
+
+/**
* True if create IME window to show accented characters.
*
* @type {boolean}
@@ -195,9 +205,11 @@ AltDataView.prototype.enterDocument = function() {
* @param {!i18n.input.chrome.inputview.elements.content.SoftKey} key The key
* triggerred this altdata view.
* @param {boolean} isRTL Whether to show the key characters as RTL.
+ * @param {number} identifier The identifer of event which trigger show.
*/
-AltDataView.prototype.show = function(key, isRTL) {
+AltDataView.prototype.show = function(key, isRTL, identifier) {
this.triggeredBy = key;
+ this.identifier = identifier;
var parentKeyLeftTop = goog.style.getClientPosition(key.getElement());
var width = key.availableWidth;
var height = key.availableHeight;
@@ -269,7 +281,8 @@ AltDataView.prototype.show = function(key, isRTL) {
numOfRows, w, h, startKeyIndex);
self.highlightItem(
Math.ceil(parentKeyLeftTop.x + w / 2),
- Math.ceil(parentKeyLeftTop.y + h / 2));
+ Math.ceil(parentKeyLeftTop.y + h / 2),
+ identifier);
var marginBox = goog.style.getMarginBox(
contentWindow.document.body);
// Adjust the window bounds to compensate body's margin. The margin
@@ -312,7 +325,8 @@ AltDataView.prototype.show = function(key, isRTL) {
}
goog.style.setPosition(this.getElement(), left, elemTop);
this.highlightItem(Math.ceil(parentKeyLeftTop.x + w / 2),
- Math.ceil(parentKeyLeftTop.y + h / 2));
+ Math.ceil(parentKeyLeftTop.y + h / 2),
+ identifier);
}
goog.style.setElementShown(this.coverElement_, true);
@@ -411,8 +425,12 @@ AltDataView.prototype.hide = function() {
*
* @param {number} x .
* @param {number} y .
+ * @param {number} identifier The identifer of event which trigger show.
*/
-AltDataView.prototype.highlightItem = function(x, y) {
+AltDataView.prototype.highlightItem = function(x, y, identifier) {
+ if (this.identifier != identifier) {
+ return;
+ }
if (this.useIMEWindow_) {
if (this.altdataWindow_) {
var screenCoordinate = convertToScreenCoordinate(

Powered by Google App Engine
This is Rietveld 408576698