IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Missing loading wheel on user notifications page.

Browse Source
This commit is contained in:
Guo Xiang Tan 2016-06-28 08:37:36 +08:00
parent 156953bc55
commit fc81209564
No known key found for this signature in database
GPG Key ID: 19C321C8952B0F72
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/controllers/user-notifications.js.es6
View File

@ -1,9 +1,12 @@
import { observes } from 'ember-addons/ember-computed-decorators';
export default Ember.ArrayController.extend({ export default Ember.ArrayController.extend({
needs: ['application'], needs: ['application'],
_showFooter: function() { @observes('model.canLoadMore')
_showFooter() {
this.set("controllers.application.showFooter", !this.get("model.canLoadMore")); this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
}.observes("model.canLoadMore"), },
currentPath: Em.computed.alias('controllers.application.currentPath'), currentPath: Em.computed.alias('controllers.application.currentPath'),

2
app/assets/javascripts/discourse/templates/user/notifications.hbs
View File

@ -1,4 +1,3 @@
<section class='user-navigation'> <section class='user-navigation'>
{{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}} {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
{{#if model}} {{#if model}}
@ -25,5 +24,6 @@
<section class='user-right'> <section class='user-right'>
{{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}} {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}}
{{outlet}} {{outlet}}
{{conditional-loading-spinner condition=model.loadingMore}}
{{/load-more}} {{/load-more}}
</section> </section>