From 9e4942eeeb80a63020d64b7c7ef97074021c8695 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 22 Dec 2014 16:08:39 +1100
Subject: [PATCH] FIX: don't pop up "cancel" when returning to topic

---
 .../javascripts/discourse/controllers/composer.js.es6       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 5acee185ecf..4dc72a310b4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -336,15 +336,13 @@ export default DiscourseController.extend({
 
         // If we're already open, we don't have to do anything
         if (composerModel.get('composeState') === Discourse.Composer.OPEN &&
-            composerModel.get('draftKey') === opts.draftKey &&
-            composerModel.action === opts.action) {
+            composerModel.get('draftKey') === opts.draftKey) {
           return resolve();
         }
 
         // If it's the same draft, just open it up again.
         if (composerModel.get('composeState') === Discourse.Composer.DRAFT &&
-            composerModel.get('draftKey') === opts.draftKey &&
-            composerModel.action === opts.action) {
+            composerModel.get('draftKey') === opts.draftKey) {
 
             composerModel.set('composeState', Discourse.Composer.OPEN);
             return resolve();