Chat: Show message dates

This commit is contained in:
2015-05-31 05:13:00 +02:00
parent eef5e3dbbf
commit 7a3d8bc739
2 changed files with 16 additions and 5 deletions

View File

@@ -95,7 +95,7 @@ namespace Scrummer.Code.JSON
private void WriteValue(StringBuilder sbOutput, Object obj, int level, bool useReflection)
{
if (obj == null)
if (obj == null || obj is DBNull)
{
// NULL
sbOutput.Append("null");
@@ -116,6 +116,13 @@ namespace Scrummer.Code.JSON
// Booleans
sbOutput.Append(((Boolean)obj) ? "true" : "false");
}
else if (obj is DateTime)
{
// DateTime
sbOutput.Append('"');
sbOutput.Append(((DateTime)obj).ToString("yyyy-MM-ddTHH:mm:ssZ"));
sbOutput.Append('"');
}
else if (obj is IDictionary)
{
// Objects

View File

@@ -4,7 +4,7 @@
hidUserName = GetElement(hidUserName);
hidLastUser = GetElement(hidLastUser);
var CreateMessageDOM = function (message, selfMessage, hidLastUser) {
var CreateMessageDOM = function (message, selfMessage, showUserName) {
var divMessageRow = document.createElement("DIV");
if (selfMessage) {
divMessageRow.className = "selfMessageRow";
@@ -16,12 +16,11 @@
divMessage.className = "message";
divMessageRow.appendChild(divMessage);
if (hidLastUser.value !== message.UserName) {
if (showUserName) {
var divUser = document.createElement("DIV");
divUser.className = "user";
divUser.innerHTML = escapeHTML(message.UserName);
divMessage.appendChild(divUser);
hidLastUser.value = message.UserName;
}
var text = message.Text;
@@ -31,6 +30,8 @@
divText.innerHTML = escapeHTML(text);
divMessage.appendChild(divText);
divMessage.title = new Date(message.Date);
return divMessageRow;
};
@@ -47,7 +48,10 @@
if (idMessage < msg.IDMessage) {
hidIDMessage.value = msg.IDMessage;
idMessage = msg.IDMessage;
var elemMessage = CreateMessageDOM(msg, (msg.UserName == hidUserName.value), hidLastUser);
var elemMessage = CreateMessageDOM(msg,
(msg.UserName == hidUserName.value),
(hidLastUser.value !== msg.UserName));
hidLastUser.value = msg.UserName;
frag.appendChild(elemMessage);
}
}