moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-11-22 01:02:23 -05:00
Code Issues Releases Wiki Activity

Fix: Messages group: the same day, within 5 minutes

Browse Source
This commit is contained in:
Sebastien Hut 2015-01-26 17:54:47 +01:00
parent d5886c7507
commit 9e06b50fd3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientapp/models/message.js
View File

@ -238,9 +238,9 @@ var Message = module.exports = HumanModel.define({
}, },
shouldGroupWith: function (previous) { shouldGroupWith: function (previous) {
if (this.type === 'groupchat') { if (this.type === 'groupchat') {
return previous && previous.from.full === this.from.full; return previous && previous.from.full === this.from.full && Math.round((this.created - previous.created) / 1000) <= 300 && previous.created.toLocaleDateString() === this.created.toLocaleDateString();
} else { } else {
return previous && previous.from.bare === this.from.bare; return previous && previous.from.bare === this.from.bare && Math.round((this.created - previous.created) / 1000) <= 300 && previous.created.toLocaleDateString() === this.created.toLocaleDateString();
} }
} }
}); });

2
clientapp/pages/chat.js
View File

@ -231,9 +231,9 @@ module.exports = BasePage.extend({
} else { } else {
newEl = $(model.templateHtml); newEl = $(model.templateHtml);
this.staydown.append(newEl[0]); this.staydown.append(newEl[0]);
this.lastModel = model;
} }
embedIt(newEl); embedIt(newEl);
this.lastModel = model;
}, },
handleAcceptClick: function (e) { handleAcceptClick: function (e) {
e.preventDefault(); e.preventDefault();

2
clientapp/pages/groupchat.js
View File

@ -252,9 +252,9 @@ module.exports = BasePage.extend({
} else { } else {
newEl = $(model.templateHtml); newEl = $(model.templateHtml);
this.staydown.append(newEl[0]); this.staydown.append(newEl[0]);
this.lastModel = model;
} }
embedIt(newEl); embedIt(newEl);
this.lastModel = model;
}, },
refreshModel: function (model) { refreshModel: function (model) {
var existing = this.$('#chat' + model.cid); var existing = this.$('#chat' + model.cid);