@@ -94,8 +94,8 @@ class ActivityController {
|
|||||||
});
|
});
|
||||||
$target.on('inserted.atwho', function (je, $el) {
|
$target.on('inserted.atwho', function (je, $el) {
|
||||||
$(je.target).find(
|
$(je.target).find(
|
||||||
'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
|
'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
|
||||||
).avatar();
|
).avatar();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,10 +48,12 @@ class ActivityService {
|
|||||||
}, this);
|
}, this);
|
||||||
this.commentCollection.on('sync', function(a) {
|
this.commentCollection.on('sync', function(a) {
|
||||||
for (let index in this.toEnhanceWithComments) {
|
for (let index in this.toEnhanceWithComments) {
|
||||||
let item = this.toEnhanceWithComments[index];
|
if (this.toEnhanceWithComments.hasOwnProperty(index)) {
|
||||||
item.commentModel = this.commentCollection.get(item.subject_rich[1].comment);
|
let item = this.toEnhanceWithComments[index];
|
||||||
if (typeof item.commentModel !== 'undefined') {
|
item.commentModel = this.commentCollection.get(item.subject_rich[1].comment);
|
||||||
this.toEnhanceWithComments = this.toEnhanceWithComments.filter(entry => entry.id !== item.id);
|
if (typeof item.commentModel !== 'undefined') {
|
||||||
|
this.toEnhanceWithComments = this.toEnhanceWithComments.filter(entry => entry.id !== item.id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var firstUnread = this.commentCollection.findWhere({isUnread: true});
|
var firstUnread = this.commentCollection.findWhere({isUnread: true});
|
||||||
|
|||||||
Reference in New Issue
Block a user