From fdef4e58f09ccdd8908027f9d23fc0a435432794 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinoth.kannan@discourse.org>
Date: Fri, 8 Dec 2017 18:30:38 +0530
Subject: [PATCH] Skip markdown table conversion from rich text feature flag
 setting

---
 .../discourse/components/composer-editor.js.es6          | 4 ++--
 .../javascripts/discourse/components/d-editor.js.es6     | 9 ++++-----
 config/locales/server.en.yml                             | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 75a152eaa0f..ae1a873611b 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -436,13 +436,13 @@ export default Ember.Component.extend({
     $element.on('fileuploadpaste', (e) => {
       this._pasted = true;
 
-      if (!this.siteSettings.enable_rich_text_paste || !$(".d-editor-input").is(":focus")) {
+      if (!$(".d-editor-input").is(":focus")) {
         return;
       }
 
       const { types } = clipboardData(e);
 
-      if (types.includes("text/plain") || types.includes("text/html")) {
+      if (types.includes("text/plain") || (types.includes("text/html") && this.siteSettings.enable_rich_text_paste)) {
         e.preventDefault();
       }
     });
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 9f23f952987..d1b3f0bfce2 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -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();
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 614f59ce59b..bc442bfaf8d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1088,7 +1088,7 @@ en:
     top_page_default_timeframe: "Default timeframe for the top view page."
     show_email_on_profile: "Show a user's email on their profile (only visible to themselves and staff)"
     prioritize_username_in_ux: "Show username first on user page, user card and posts (when disabled name is shown first)"
-    enable_rich_text_paste: "Enable automatic HTML to Markdown conversion"
+    enable_rich_text_paste: "Enable automatic HTML to Markdown conversion while pasting."
 
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."