Commit eb8fb67b authored by JC Brand's avatar JC Brand

Get the last messages and append them (still not 100% bugfree)

parent de73fb21
...@@ -91,8 +91,7 @@ xmppchat.UI = (function (xmppUI, $, console) { ...@@ -91,8 +91,7 @@ xmppchat.UI = (function (xmppUI, $, console) {
data: { data: {
chat_id: 'chatbox_'+jid, chat_id: 'chatbox_'+jid,
box_id: chat_id, box_id: chat_id,
jid: jid, jid: jid
tzoffset: -(new Date().getTimezoneOffset())
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log(textStatus); console.log(textStatus);
...@@ -100,8 +99,8 @@ xmppchat.UI = (function (xmppUI, $, console) { ...@@ -100,8 +99,8 @@ xmppchat.UI = (function (xmppUI, $, console) {
return; return;
}, },
success: function(data) { success: function(data) {
var chat_id = $(data).attr('id'); var chat_id = $(data).attr('id'),
var $chat = $('body').append(data).find('#'+chat_id); $chat = $('body').append(data).find('#'+chat_id);
$chat.find('.chat-message .time').each(function () { $chat.find('.chat-message .time').each(function () {
var jthis = $(this); var jthis = $(this);
var time = jthis.text().split(':'); var time = jthis.text().split(':');
...@@ -112,6 +111,34 @@ xmppchat.UI = (function (xmppUI, $, console) { ...@@ -112,6 +111,34 @@ xmppchat.UI = (function (xmppUI, $, console) {
date.setMinutes(minutes); date.setMinutes(minutes);
jthis.replaceWith(date.toLocaleTimeString().substring(0,5)); jthis.replaceWith(date.toLocaleTimeString().substring(0,5));
}); });
xmppchat.Collections.getLastMessages(jid, function (result) {
$(result).find('chat').children().each(function (idx, el) {
if (el.tagName !== 'set') {
// TODO: Calculate the time. We have the start time and the offset for each message...
var chat_id = $(data).attr('id');
var $chat = $('body').append(data).find('#'+chat_id);
var $content = $chat.find(".chat-content");
var text = $(el).find('body').text();
var now = new Date();
var time = now.toLocaleTimeString().substring(0,5),
div = $('<div class="chat-message delayed"></div>');
if (el.tagName == 'to') {
message_html = div.append(
'<span class="chat-message-me">'+time+' me:&nbsp;&nbsp;</span>' +
'<span class="chat-message-content">'+text+'</span>'
);
} else {
message_html = div.append(
'<span class="chat-message-them">'+time+' '+data.fullname+':&nbsp;&nbsp;</span>' +
'<span class="chat-message-content">'+text+'</span>'
);
}
$content.append(message_html);
$content.scrollTop($content[0].scrollHeight);
}
});
});
callback($chat); callback($chat);
} }
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment