From f0100ca7c0f4b3d313b7a9bed771a83c12db661c Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 4 Aug 2015 19:14:00 +0930
Subject: [PATCH] Don't clear the discussion list when loading new results

---
 extensions/pusher/js/forum/src/main.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/extensions/pusher/js/forum/src/main.js b/extensions/pusher/js/forum/src/main.js
index 085ff6c16..d3495dd2f 100644
--- a/extensions/pusher/js/forum/src/main.js
+++ b/extensions/pusher/js/forum/src/main.js
@@ -5,6 +5,7 @@ import app from 'flarum/app';
 import DiscussionList from 'flarum/components/DiscussionList';
 import DiscussionPage from 'flarum/components/DiscussionPage';
 import IndexPage from 'flarum/components/IndexPage';
+import Button from 'flarum/components/Button';
 
 app.initializers.add('pusher', () => {
   const loadPusher = m.deferred();
@@ -52,16 +53,20 @@ app.initializers.add('pusher', () => {
 
       if (count) {
         vdom.children.unshift(
-          <button className="Button Button--block DiscussionList-update"
-            onclick={() => {
-              app.pushedUpdates = [];
-              this.refresh();
-            }}
-            config={(element, isInitialized) => {
-              if (!isInitialized) $(element).hide().fadeIn();
-            }}>
-            {app.trans('pusher.show_updated_discussions', {count})}
-          </button>
+          Button.component({
+            className: 'Button Button--block DiscussionList-update',
+            onclick: () => {
+              this.refresh(false).then(() => {
+                this.loadingUpdated = false;
+                app.pushedUpdates = [];
+                app.setTitleCount(0);
+                m.redraw();
+              });
+              this.loadingUpdated = true;
+            },
+            loading: this.loadingUpdated,
+            children: app.trans('pusher.show_updated_discussions', {count})
+          })
         );
       }
     }