mirror of
https://github.com/discourse/discourse.git
synced 2025-03-06 03:09:43 +00:00
Merge pull request #228 from tms/i-knew-you-cared
Collapse user activity items loaded from message bus
This commit is contained in:
commit
4d99dc035e
@ -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]);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user