codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-28 15:03:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Loading was broken on activity streams

Browse source
This commit is contained in:
Robin Ward 2013-07-27 13:55:34 -04:00
parent 3a861c0823
commit a0cbbab37a
1 changed files with 7 additions and 6 deletions

13
app/assets/javascripts/discourse/models/user_stream.js
View file

@ -27,7 +27,12 @@ Discourse.UserStream = Discourse.Model.extend({
filterBy: function(filter) { filterBy: function(filter) {
if (this.get('loaded') && (this.get('filter') === filter)) { return Ember.RSVP.resolve(); } if (this.get('loaded') && (this.get('filter') === filter)) { return Ember.RSVP.resolve(); }
this.set('filter', filter);
this.setProperties({
filter: filter,
itemsLoaded: 0,
content: []
});
return this.findItems(); return this.findItems();
}, },
@ -35,11 +40,7 @@ Discourse.UserStream = Discourse.Model.extend({
var userStream = this; var userStream = this;
if(this.get('loading')) { return Ember.RSVP.reject(); } if(this.get('loading')) { return Ember.RSVP.reject(); }
this.setProperties({ this.set('loading', true);
loading: true,
itemsLoaded: 0,
content: []
});
var url = this.get('baseUrl'); var url = this.get('baseUrl');
if (this.get('filterParam')) { if (this.get('filterParam')) {