From 7a32a995953db70c778f69a9f69a6e5c7f96463e Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Sat, 28 Mar 2020 22:24:43 +0530
Subject: [PATCH] FIX: Quoting a nested quote should preserve original post
 info.

---
 app/assets/javascripts/discourse/components/quote-button.js | 1 +
 app/assets/javascripts/discourse/lib/utilities.js           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/quote-button.js b/app/assets/javascripts/discourse/components/quote-button.js
index 141d9f32ac8..3a9ec42fe0c 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js
+++ b/app/assets/javascripts/discourse/components/quote-button.js
@@ -65,6 +65,7 @@ export default Component.extend({
         opts.username = element.dataset.username || getQuoteTitle(element);
         opts.post = element.dataset.post;
         opts.topic = element.dataset.topic;
+        break;
       }
     }
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js
index e44a60d53a7..87aeb9a821c 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js
+++ b/app/assets/javascripts/discourse/lib/utilities.js
@@ -149,7 +149,7 @@ export function selectedText() {
 export function selectedElement() {
   const selection = window.getSelection();
   if (selection.rangeCount > 0) {
-    return selection.getRangeAt(0).startContainer.parentElement;
+    return selection.getRangeAt(0).commonAncestorContainer.parentElement;
   }
 }