IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: plain text table detection should work even if html content not found.

Browse Source
This commit is contained in:
Vinoth Kannan 2019-04-26 11:16:41 +05:30
parent dc2ee78f7a
commit be0ae2e487
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -804,6 +804,21 @@ export default Ember.Component.extend({
const { pre, lineVal } = this._getSelected(null, { lineVal: true });
const isInlinePasting = pre.match(/[^\n]$/);
const isCodeBlock = isInside(pre, /(^|\n)```/g);
if (
plainText &&
this.siteSettings.enable_rich_text_paste &&
!isInlinePasting &&
!isCodeBlock
) {
plainText = plainText.trim().replace(/\r/g, "");
const table = this._extractTable(plainText);
if (table) {
this.appEvents.trigger("composer:insert-text", table);
handled = true;
}
}
if (canPasteHtml && plainText) {
if (isInlinePasting) {
@ -813,16 +828,7 @@ export default Ember.Component.extend({
lineVal.match(/^ /)
);
} 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;
}
}
canPasteHtml = !isCodeBlock;
}
}