diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/chat.php | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pages/chat.php b/pages/chat.php index f68db7e..41b07fb 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -65,6 +65,7 @@ function getChatDone(data) { //var timestamp = postDate.format("ddd h:MM TT");
//var timestamp = postDate.format("h:MM:ss");
var timestamp = postDate.format("hh:MM:ss");
+ var timestampDetails = postDate.format("ddd h:MM TT");
var strClass = '';
if (chat.userID == userObj.ID) {
@@ -75,23 +76,23 @@ function getChatDone(data) { chat.displayName = 'SERVER'
}
- var isSpoiler = false;
- if (chat.message.indexOf("/spoiler ") == 0) {
- chat.message = chat.message.substring(9);
- isSpoiler = true;
- }
-
var usernameClass = '';
if (chat.message.indexOf("/me ") == 0) {
chat.message = chat.message.substring(4);
usernameClass = ' me';
}
+ var isSpoiler = false;
+ if (chat.message.indexOf("/spoiler ") == 0) {
+ chat.message = chat.message.substring(9);
+ isSpoiler = true;
+ }
+
//console.log("INSIDE BUILD START");
p = '';
p = p+ " <div class='chatColumn1'>";
- p = p+ " <span class='chatTimestamp'>["+timestamp+"]</span>";
+ p = p+ " <span class='chatTimestamp' title='"+timestampDetails+"'>["+timestamp+"]</span>";
p = p+ " <div class='grid_td chatBadge' style='float:left; width:35px; height:35px; background:"+chat.wallColor+" url(images/marks/"+chat.wallEmblem+");'>";
p = p+ " <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";
p = p+ " </div>";
@@ -143,10 +144,18 @@ function getChatDone(data) { function chatReplaceAndEncode(chat) {
chat = htmlEncode(chat);
- chat = chat.replace(/\*(\S(.*?\S)?)\*/gm, "<b>$1</b>");
+ chat = chat.replace(/\*\*(\S(.*?\S)?)\*\*/gm, "<b>$1</b>");
+ chat = chat.replace(/\~\~(\S(.*?\S)?)\~\~/gm, "<s>$1</s>");
+ chat = chat.replace(/\*(\S(.*?\S)?)\*/gm, "<i>$1</i>");
+ //TODO: For Blue:
+ // I want the # in the to=$1 to turn into %23; but not anywhere else.
var URLexp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
chat = chat.replace(URLexp, "<a href='redirect?to=$1' target='top'>$1</a>");
+ //Here's to hoping no one puts a hash infront of a URL...
+ chat = chat.replace(/\#/, "%23");
+ //Here's for when someone does that and goes "wth?"
+ //chat = chat.replace(/\#/g, "%23");
return chat;
}
|