rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

A few tweaks, cleanup

Browse source
This commit is contained in:
calzoneman 2013-11-18 11:11:00 -06:00
parent 0e95ef2aa4
commit b250f3c64b
2 changed files with 41 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

77
www/assets/js/util.js
View file

@ -1442,22 +1442,27 @@ function sendVideoUpdate() {
/* chat */
function formatChatMessage(data) {
// Phase 1: Determine whether to show the username or not
var skip = data.username === LASTCHATNAME;
if (data.meta.forceShowName) {
skip = false;
}
if(data.msgclass == "server-whisper")
if(data.meta.addClass === "server-whisper")
skip = true;
// Prevent impersonation by abuse of the bold filter
if(data.msg.match(/^\s*<strong>\w+\s*:\s*<\/strong>\s*/))
skip = false;
if (data.meta.forceShowName)
skip = false;
LASTCHATNAME = data.username;
LASTCHATTIME = data.time;
var div = $("<div/>");
/* drink is a special case because the entire container gets the class, not
just the message */
if (data.meta.addClass === "drink") {
div.addClass("drink");
data.meta.addClass = "";
}
// Add timestamps (unless disabled)
if (USEROPTS.show_timestamps) {
var time = $("<span/>").addClass("timestamp").appendTo(div);
var timestamp = new Date(data.time).toTimeString().split(" ")[0];
@ -1468,6 +1473,7 @@ function formatChatMessage(data) {
}
}
// Add username
var name = $("<span/>");
if (!skip) {
name.appendTo(div);
@ -1487,9 +1493,11 @@ function formatChatMessage(data) {
.prependTo(name);
}
// Add the message itself
var message = $("<span/>").appendTo(div);
message[0].innerHTML = data.msg;
// For /me the username is part of the message
if (data.meta.action) {
name.remove();
message[0].innerHTML = data.username + " " + data.msg;
@ -1500,68 +1508,13 @@ function formatChatMessage(data) {
return div;
}
function oldFormatChatMessage(data) {
var skip = data.username == LASTCHATNAME;
if(data.msgclass == "drink" || data.msgclass == "shout") {
skip = false;
}
if(data.superadminflair)
skip = false;
if(data.msgclass == "server-whisper")
skip = true;
// Prevent impersonation by abuse of the bold filter
if(data.msg.match(/^\s*<strong>\w+\s*:\s*<\/strong>\s*/))
skip = false;
LASTCHATNAME = data.username;
LASTCHATTIME = data.time;
var div = $("<div/>");
if(USEROPTS.show_timestamps) {
var time = $("<span/>").addClass("timestamp").appendTo(div);
var timestamp = new Date(data.time).toTimeString().split(" ")[0];
time.text("["+timestamp+"] ");
if(data.msgclass == "shout" || data.msgclass == "server-whisper")
time.addClass(data.msgclass);
}
var name = $("<span/>");
if(!skip) {
name.appendTo(div);
}
$("<strong/>").addClass("username").text(data.username + ": ").appendTo(name);
var message = $("<span/>").appendTo(div);
message[0].innerHTML = data.msg;
if(data.modflair) {
name.addClass(getNameColor(data.modflair));
}
if(data.superadminflair) {
name.addClass("label")
.addClass(data.superadminflair.labelclass);
$("<i/>").addClass(data.superadminflair.icon)
.addClass("icon-white")
.prependTo(name);
}
if(data.msgclass == "action") {
name.remove();
message.addClass("action");
message[0].innerHTML = data.username + " " + data.msg;
}
else if(data.msgclass == "drink") {
div.addClass("drink");
}
else if(data.msgclass == "shout") {
message.addClass("shout");
name.addClass("shout");
}
else {
message.addClass(data.msgclass);
}
return div;
}
function addChatMessage(data) {
if(IGNORED.indexOf(data.username) != -1) {
if(IGNORED.indexOf(data.username) !== -1) {
return;
}
var div = formatChatMessage(data);
// Incoming: a bunch of crap for the feature where if you hover over
// a message, it highlights messages from that user
div.data("sender", data.username);
div.appendTo($("#messagebuffer"));
div.mouseover(function() {