From dc2ee78f7a667cd0ded8e198282def7ea51797bb Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Fri, 26 Apr 2019 09:20:10 +0530 Subject: [PATCH] UX: Only do plain text table detection in outside code if HTML pasting enabled Co-authored-by: Tim Lange PR: https://github.com/discourse/discourse/pull/7436 --- .../discourse/components/d-editor.js.es6 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 2b82d2ea17..302a545194 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -802,15 +802,6 @@ export default Ember.Component.extend({ let html = clipboard.getData("text/html"); let handled = false; - if (plainText) { - plainText = plainText.trim().replace(/\r/g, ""); - const table = this._extractTable(plainText); - if (table) { - this.appEvents.trigger("composer:insert-text", table); - handled = true; - } - } - const { pre, lineVal } = this._getSelected(null, { lineVal: true }); const isInlinePasting = pre.match(/[^\n]$/); @@ -823,6 +814,15 @@ export default Ember.Component.extend({ ); } else { canPasteHtml = !isInside(pre, /(^|\n)```/g); + + if (canPasteHtml) { + plainText = plainText.trim().replace(/\r/g, ""); + const table = this._extractTable(plainText); + if (table) { + this.appEvents.trigger("composer:insert-text", table); + handled = true; + } + } } }