From a80ae5c40091114837efd61c30b900a3bac3f3ff Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 18 May 2015 10:37:07 +0930
Subject: [PATCH] Minimise composer when exiting a page, rather than entering
 it

---
 framework/core/js/forum/src/components/discussion-page.js | 2 +-
 framework/core/js/forum/src/components/index-page.js      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/core/js/forum/src/components/discussion-page.js b/framework/core/js/forum/src/components/discussion-page.js
index b42528fb5..4dc80754e 100644
--- a/framework/core/js/forum/src/components/discussion-page.js
+++ b/framework/core/js/forum/src/components/discussion-page.js
@@ -47,7 +47,6 @@ export default class DiscussionPage extends Component {
 
     app.history.push('discussion');
     app.current = this;
-    app.composer.minimize();
   }
 
   params() {
@@ -125,6 +124,7 @@ export default class DiscussionPage extends Component {
     }
 
     app.pane.disable();
+    app.composer.minimize();
   }
 
   /**
diff --git a/framework/core/js/forum/src/components/index-page.js b/framework/core/js/forum/src/components/index-page.js
index ec3e955ea..48caa2795 100644
--- a/framework/core/js/forum/src/components/index-page.js
+++ b/framework/core/js/forum/src/components/index-page.js
@@ -40,7 +40,6 @@ export default class IndexPage extends Component {
 
     app.history.push('index');
     app.current = this;
-    app.composer.minimize();
   }
 
   onunload() {
@@ -144,6 +143,10 @@ export default class IndexPage extends Component {
     }
   }
 
+  onunload() {
+    app.composer.minimize();
+  }
+
   newDiscussion() {
     if (app.session.user()) {
       app.composer.load(new ComposerDiscussion({ user: app.session.user() }));