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

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/controller.js

Issue 975453003: Update Google Input Tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/controller.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/controller.js b/third_party/google_input_tools/src/chrome/os/inputview/controller.js
index 52b65d70b05e291134604dc3a7f501dc11265a26..6d4bc106d8d5ca92af2c3d9e91fd8e55b8123ddb 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/controller.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/controller.js
@@ -601,7 +601,8 @@ Controller.prototype.onSettingsReady_ = function() {
newKeyset = /** @type {string} */ (this.model_.settings.
getPreference(util.getConfigName(keysetMap[ContextType.DEFAULT])));
}
- if (!this.adapter_.isExperimental && keysetMap[ContextType.DEFAULT] ==
+ if (!this.adapter_.features.isEnabled(FeatureName.EXPERIMENTAL) &&
+ keysetMap[ContextType.DEFAULT] ==
'zhuyin.compact.qwerty') {
newKeyset = 'zhuyin';
}
@@ -739,7 +740,7 @@ Controller.prototype.onPointerEvent_ = function(e) {
*/
Controller.prototype.onDragEvent_ = function(e) {
if (this.adapter_.isGestureTypingEnabled() && e.type == EventType.DRAG) {
- this.container_.gestureCanvasView.addPointAndDraw(e);
+ this.container_.gestureCanvasView.addPoint(e);
return;
}
};
@@ -846,8 +847,8 @@ Controller.prototype.executeCommand_ = function(command, opt_arg) {
*/
Controller.prototype.handlePointerAction_ = function(view, e) {
if (this.adapter_.isGestureTypingEnabled() &&
- e.type == EventType.POINTER_UP) {
- this.container_.gestureCanvasView.clear();
+ e.type == EventType.POINTER_DOWN) {
+ this.container_.gestureCanvasView.startStroke(e);
}
// Listen for DOUBLE_CLICK as well to capture secondary taps on the spacebar.
@@ -1257,7 +1258,8 @@ Controller.prototype.handlePointerEventForSoftKey_ = function(softKey, e) {
var defaultFullKeyset = this.initialKeyset_.split(/\./)[0];
var enableCompact = !this.adapter_.isA11yMode && goog.array.contains(
util.KEYSETS_HAVE_COMPACT, defaultFullKeyset);
- if (defaultFullKeyset == 'zhuyin' && !this.adapter_.isExperimental ||
+ if (defaultFullKeyset == 'zhuyin' &&
+ !this.adapter_.features.isEnabled(FeatureName.EXPERIMENTAL) ||
this.languageCode_ == 'ko') {
// Hides 'switch to compact' for zhuyin when not in experimental env.
enableCompact = false;

Powered by Google App Engine
This is Rietveld 408576698