From f2fa816f49c5b8ed5195722fa46e581c6494b8c5 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Thu, 5 Feb 2015 14:45:33 +0100 Subject: [PATCH] Update itext_behavior.mixin.js --- src/mixins/itext_behavior.mixin.js | 1 + src/mixins/itext_key_behavior.mixin.js | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mixins/itext_behavior.mixin.js b/src/mixins/itext_behavior.mixin.js index 28114007..3ab53d7e 100644 --- a/src/mixins/itext_behavior.mixin.js +++ b/src/mixins/itext_behavior.mixin.js @@ -327,6 +327,7 @@ this.isEditing = true; this.initHiddenTextarea(); + this.hiddenTextarea.focus(); this._updateTextarea(); this._saveEditingProps(); this._setEditingProps(); diff --git a/src/mixins/itext_key_behavior.mixin.js b/src/mixins/itext_key_behavior.mixin.js index e700ed73..7718a458 100644 --- a/src/mixins/itext_key_behavior.mixin.js +++ b/src/mixins/itext_key_behavior.mixin.js @@ -15,11 +15,6 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot fabric.util.addListener(this.hiddenTextarea, 'keypress', this.onKeyPress.bind(this)); fabric.util.addListener(this.hiddenTextarea, 'copy', this.copy.bind(this)); fabric.util.addListener(this.hiddenTextarea, 'paste', this.paste.bind(this)); - - if (!this._clickHandlerInitialized && this.canvas) { - fabric.util.addListener(this.canvas.upperCanvasEl, 'click', this.onClick.bind(this)); - this._clickHandlerInitialized = true; - } }, /** @@ -49,11 +44,6 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot 88: 'cut' }, - onClick: function() { - // No need to trigger click event here, focus is enough to have the keyboard appear on Android - this.hiddenTextarea && this.hiddenTextarea.focus(); - }, - /** * Handles keyup event * @param {Event} e Event object