From 1960fc533323e9e43a609247a997c0e4a8bb8cc4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Fri, 4 Dec 2020 00:05:43 +0100
Subject: [PATCH] FIX: Stop using duplicate composer button ID (#11404)

"quote" is used by the button added in `composer-editor`.
https://github.com/discourse/discourse/blob/bbe5d8d5cf1220165842985c0e2cd4c454d501cd/app/assets/javascripts/discourse/app/components/composer-editor.js#L875-L882
---
 .../javascripts/discourse/app/components/d-editor.js |  2 +-
 .../tests/integration/components/d-editor-test.js    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 976acf965fc..9fd17ad9dec 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -104,7 +104,7 @@ class Toolbar {
     }
 
     this.addButton({
-      id: "quote",
+      id: "blockquote",
       group: "insertions",
       icon: "quote-right",
       shortcut: "Shift+9",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index aa11d74479f..cf87c4ef460 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -459,13 +459,13 @@ third line`
 
       textarea.selectionStart = 0;
 
-      await click("button.quote");
+      await click("button.blockquote");
 
       assert.equal(this.value, "> one\n> \n> two\n> \n> three");
       assert.equal(textarea.selectionStart, 0);
       assert.equal(textarea.selectionEnd, 25);
 
-      await click("button.quote");
+      await click("button.blockquote");
       assert.equal(this.value, "one\n\ntwo\n\nthree");
     },
   });
@@ -481,7 +481,7 @@ third line`
       textarea.selectionStart = 6;
       textarea.selectionEnd = 10;
 
-      await click("button.quote");
+      await click("button.blockquote");
       assert.equal(this.value, "one\n\n\n> \n> two");
     },
   });
@@ -490,12 +490,12 @@ third line`
     textarea.selectionStart = 6;
     textarea.selectionEnd = 9;
 
-    await click("button.quote");
+    await click("button.blockquote");
     assert.equal(this.value, "hello\n\n> wor\n\nld.");
     assert.equal(textarea.selectionStart, 7);
     assert.equal(textarea.selectionEnd, 12);
 
-    await click("button.quote");
+    await click("button.blockquote");
 
     assert.equal(this.value, "hello\n\nwor\n\nld.");
     assert.equal(textarea.selectionStart, 7);
@@ -504,7 +504,7 @@ third line`
     textarea.selectionStart = 15;
     textarea.selectionEnd = 15;
 
-    await click("button.quote");
+    await click("button.blockquote");
     assert.equal(this.value, "hello\n\nwor\n\nld.\n\n> Blockquote");
   });