Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Only do plain text table detection in outside code if HTML pasting enabled 

Co-authored-by: Tim Lange <tim.lange@titanhq.de>
PR: https://github.com/discourse/discourse/pull/7436
This commit is contained in:
Vinoth Kannan 2019-04-26 09:20:10 +05:30
parent abecb3aea8
commit dc2ee78f7a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -802,15 +802,6 @@ export default Ember.Component.extend({
let html = clipboard.getData("text/html"); let html = clipboard.getData("text/html");
let handled = false; 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 { pre, lineVal } = this._getSelected(null, { lineVal: true });
const isInlinePasting = pre.match(/[^\n]$/); const isInlinePasting = pre.match(/[^\n]$/);
@ -823,6 +814,15 @@ export default Ember.Component.extend({
); );
} else { } else {
canPasteHtml = !isInside(pre, /(^|\n)```/g); 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;
}
}
} }
} }