From 8f547d91c158aece69938cb3682713cefc4c4c95 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Tue, 14 Jul 2015 13:09:13 +0200 Subject: [PATCH] Update itext_key_behavior.mixin.js --- src/mixins/itext_key_behavior.mixin.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mixins/itext_key_behavior.mixin.js b/src/mixins/itext_key_behavior.mixin.js index 62812db2a35..4e562699474 100644 --- a/src/mixins/itext_key_behavior.mixin.js +++ b/src/mixins/itext_key_behavior.mixin.js @@ -114,18 +114,20 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot */ paste: function(e) { var copiedText = null, - clipboardData = this._getClipboardData(e); + clipboardData = this._getClipboardData(e), + usedCopiedStyle; // Check for backward compatibility with old browsers if (clipboardData) { - copiedText = clipboardData.getData('text'); + copiedText = clipboardData.getData('text').replace(/\r/g, ''); } else { copiedText = this.copiedText; + usedCopiedStyle = true; } if (copiedText) { - this.insertChars(copiedText, true); + this.insertChars(copiedText, usedCopiedStyle); } },