github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 14:30:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

never double load the stream.

Browse Source
This commit is contained in:
Sam 2013-07-05 21:23:01 +10:00
parent a1f1849392
commit 363e1010c4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/models/user_stream.js
View File

@ -17,6 +17,10 @@ Discourse.UserStream = Discourse.Model.extend({
}.observes('filter'), }.observes('filter'),
findItems: function() { findItems: function() {
var me = this;
if(this.get("loading")) { return; }
this.set("loading",true);
var url = Discourse.getURL("/user_actions.json?offset=") + this.get('itemsLoaded') + "&username=" + (this.get('user.username_lower')); var url = Discourse.getURL("/user_actions.json?offset=") + this.get('itemsLoaded') + "&username=" + (this.get('user.username_lower'));
if (this.get('filter')) { if (this.get('filter')) {
url += "&filter=" + (this.get('filter')); url += "&filter=" + (this.get('filter'));
@ -24,6 +28,7 @@ Discourse.UserStream = Discourse.Model.extend({
var stream = this; var stream = this;
return Discourse.ajax(url, {cache: 'false'}).then( function(result) { return Discourse.ajax(url, {cache: 'false'}).then( function(result) {
me.set("loading",false);
if (result && result.user_actions) { if (result && result.user_actions) {
var copy = Em.A(); var copy = Em.A();
_.each(result.user_actions,function(action) { _.each(result.user_actions,function(action) {
@ -33,7 +38,7 @@ Discourse.UserStream = Discourse.Model.extend({
stream.get('content').pushObjects(copy); stream.get('content').pushObjects(copy);
stream.set('itemsLoaded', stream.get('itemsLoaded') + result.user_actions.length); stream.set('itemsLoaded', stream.get('itemsLoaded') + result.user_actions.length);
} }
}); }, function(){ me.set("loading", false); });
} }
}); });