From fc81209564f525b69cce8aafbcf87bd5f90f5993 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 28 Jun 2016 08:37:36 +0800
Subject: [PATCH] UX: Missing loading wheel on user notifications page.

---
 .../discourse/controllers/user-notifications.js.es6        | 7 +++++--
 .../javascripts/discourse/templates/user/notifications.hbs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index b61c7d45f6f..8e860c2de50 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,9 +1,12 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
+
 export default Ember.ArrayController.extend({
   needs: ['application'],
 
-  _showFooter: function() {
+  @observes('model.canLoadMore')
+  _showFooter() {
     this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
-  }.observes("model.canLoadMore"),
+  },
 
   currentPath: Em.computed.alias('controllers.application.currentPath'),
 
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index bfdba81bee2..7a9f5420bf2 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,4 +1,3 @@
-
 <section class='user-navigation'>
   {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
     {{#if model}}
@@ -25,5 +24,6 @@
 <section class='user-right'>
   {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}}
     {{outlet}}
+    {{conditional-loading-spinner condition=model.loadingMore}}
   {{/load-more}}
 </section>