Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

Skip markdown table conversion from rich text feature flag setting

Browse source
This commit is contained in:
Vinoth Kannan 2017-12-08 18:30:38 +05:30
parent b9c0488687
commit fdef4e58f0
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/discourse/components/d-editor.js.es6
View file

@ -640,7 +640,7 @@ export default Ember.Component.extend({
},
paste(e) {
if (!this.siteSettings.enable_rich_text_paste || !$(".d-editor-input").is(":focus")) {
if (!$(".d-editor-input").is(":focus")) {
return;
}
@ -658,9 +658,8 @@ export default Ember.Component.extend({
}
}
const placeholder = `${ plainText || I18n.t('pasting') }`;
if (html && !handled) {
if (this.siteSettings.enable_rich_text_paste && html && !handled) {
const placeholder = `${ plainText || I18n.t('pasting') }`;
const self = this;
this.appEvents.trigger('composer:insert-text', placeholder);
@ -683,7 +682,7 @@ export default Ember.Component.extend({
});
}
const uploadFiles = types.includes("Files") && !plainText && !html;
const uploadFiles = types.includes("Files") && !plainText && !handled;
if (handled || uploadFiles) {
e.preventDefault();