|
|
@ -257,12 +257,6 @@ define([
|
|
|
|
if (msg.type !== 'MSG') { return; }
|
|
|
|
if (msg.type !== 'MSG') { return; }
|
|
|
|
|
|
|
|
|
|
|
|
// FIXME Schlameil the painter (performance does not scale well)
|
|
|
|
// FIXME Schlameil the painter (performance does not scale well)
|
|
|
|
// XXX trust the server?
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
if (channel.messages.some(function (old) {
|
|
|
|
|
|
|
|
return msg.sig === old.sig;
|
|
|
|
|
|
|
|
})) { return; }*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
channel.messages.unshift(msg);
|
|
|
|
channel.messages.unshift(msg);
|
|
|
|
var el_message = markup.message(msg);
|
|
|
|
var el_message = markup.message(msg);
|
|
|
|
$messagebox.prepend(el_message);
|
|
|
|
$messagebox.prepend(el_message);
|
|
|
@ -285,7 +279,7 @@ define([
|
|
|
|
UI.alert(Messages.contacts_removeHistoryServerError);
|
|
|
|
UI.alert(Messages.contacts_removeHistoryServerError);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// XXX clear the UI?
|
|
|
|
// TODO clear the UI
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
@ -451,7 +445,7 @@ define([
|
|
|
|
$messages.find('div.cp-app-contacts-chat[data-key]').hide();
|
|
|
|
$messages.find('div.cp-app-contacts-chat[data-key]').hide();
|
|
|
|
if ($chat.length) {
|
|
|
|
if ($chat.length) {
|
|
|
|
var $chat_messages = $chat.find('div.cp-app-contacts-message');
|
|
|
|
var $chat_messages = $chat.find('div.cp-app-contacts-message');
|
|
|
|
if ($chat_messages.length < 10) { //|| channel.needMoreHistory) { XXX
|
|
|
|
if ($chat_messages.length < 10) {
|
|
|
|
delete channel.needMoreHistory;
|
|
|
|
delete channel.needMoreHistory;
|
|
|
|
var $more = $chat.find('.cp-app-contacts-more-history');
|
|
|
|
var $more = $chat.find('.cp-app-contacts-more-history');
|
|
|
|
$more.click();
|
|
|
|
$more.click();
|
|
|
|