infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

split out message rendering into ui

pull/1/head
ansuz 2017-08-08 18:21:03 +02:00
parent fcdfa52aa9
commit cdf3cee9c8
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/common/common-messaging.js
View File

@ -188,6 +188,18 @@ define([
UI.addToFriendList(common, $block, display, remove, curvePublic);
};
ui.createMessage = function (msg, name) {
var $msg = $('<div>', {'class': 'message'})
.attr('title', msg.time ? new Date(msg.time).toLocaleString(): '?');
if (name) {
$('<div>', {'class':'sender'}).text(name).appendTo($msg);
}
$('<div>', {'class':'content'}).html(parseMessage(msg.text)).appendTo($msg);
return $msg;
};
return ui;
};
@ -599,7 +611,7 @@ define([
});
};
Msg.init = function (common, ui) { //$listContainer, $msgContainer) {
Msg.init = function (common, ui) {
// declare common variables
var network = common.getNetwork();
var proxy = common.getProxy();
@ -641,21 +653,11 @@ define([
var last = typeof(channel.lastDisplayed) === 'number'? channel.lastDisplayed: -1;
for (var i = last + 1; i<messages.length; i++) {
msg = messages[i];
$msg = $('<div>', {'class': 'message'}).appendTo($messages);
name = (msg.channel !== channel.lastSender)?
getFriend(common, msg.channel).displayName: undefined;
// date
date = msg.time ? new Date(msg.time).toLocaleString(): '?';
//$('<div>', {'class':'date'}).text(date).appendTo($msg);
$msg.attr('title', date);
// name
if (msg.channel !== channel.lastSender) {
name = getFriend(common, msg.channel).displayName;
$('<div>', {'class':'sender'}).text(name).appendTo($msg);
}
ui.createMessage(msg, name).appendTo($messages);
channel.lastSender = msg.channel;
$('<div>', {'class':'content'}).html(parseMessage(msg.text)).appendTo($msg);
}
$messages.scrollTop($messages[0].scrollHeight);
channel.lastDisplayed = i-1;