Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from tms/i-knew-you-cared 

Collapse user activity items loaded from message bus
This commit is contained in:
Sam 2013-02-21 21:53:49 -08:00
parent 6f7ec7dc21 b1c1053cf1
commit 4d99dc035e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/models/user.js
View File

@ -102,10 +102,17 @@
cache: 'false',
success: function(result) {
if (result) {
var action;
if ((_this.get('streamFilter') || result.action_type) !== result.action_type) {
return;
}
return stream.insertAt(0, Discourse.UserAction.create(result));
action = Em.A();
action.pushObject(Discourse.UserAction.create(result));
action = Discourse.UserAction.collapseStream(action);
return stream.insertAt(0, action[0]);
}
}
});