From 1e2f2a244c91ae1e5d0be02afbfdb2f5a1b5a33d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 25 Sep 2015 14:30:20 -0400
Subject: [PATCH] FIX: Clicking Reply with quoted text should work like quote
 button

Before this patch, it would ask you if you were sure you wanted to
cancel your draft even if you didn't input anything.
---
 app/assets/javascripts/discourse/controllers/topic.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index fd7b39779..99edbfa2d 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -131,15 +131,15 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
           draftSequence: topic.get('draft_sequence')
         };
 
+        if (quotedText) { opts.quote = quotedText; }
+
         if(post && post.get("post_number") !== 1){
           opts.post = post;
         } else {
           opts.topic = topic;
         }
 
-        composerController.open(opts).then(function() {
-          composerController.appendText(quotedText);
-        });
+        composerController.open(opts);
       }
       return false;
     },