From 8a66333e8cd2d710106a57e7009edfcc4cf0123e Mon Sep 17 00:00:00 2001 From: Gokberk Yaltirakli Date: Sun, 21 Jun 2015 22:14:28 +0300 Subject: [PATCH 1/2] Basic chat formatting. (Markdown bold and italic) --- wpc/static/scripts/chat.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wpc/static/scripts/chat.js b/wpc/static/scripts/chat.js index 76dd114..8b34021 100644 --- a/wpc/static/scripts/chat.js +++ b/wpc/static/scripts/chat.js @@ -112,6 +112,9 @@ }); var format_message = function(message) { + message.text = message.text.replace(/\*\*(.*?)\*\*/g, "$1"); //Markdown bold + message.text = message.text.replace(/_(.*?)_/g, "$1"); //Markdown italic + if (message.sender === myUsername) { return '' + message.sender + ': ' + message.text; } else { From 0e0a49b0a214b594048db67f3f17468a0c919186 Mon Sep 17 00:00:00 2001 From: Gokberk Yaltirakli Date: Mon, 22 Jun 2015 21:06:57 +0300 Subject: [PATCH 2/2] Improved chat formatting. It is more standards compliant now. --- wpc/static/scripts/chat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpc/static/scripts/chat.js b/wpc/static/scripts/chat.js index 8b34021..de4422f 100644 --- a/wpc/static/scripts/chat.js +++ b/wpc/static/scripts/chat.js @@ -112,8 +112,8 @@ }); var format_message = function(message) { - message.text = message.text.replace(/\*\*(.*?)\*\*/g, "$1"); //Markdown bold - message.text = message.text.replace(/_(.*?)_/g, "$1"); //Markdown italic + message.text = message.text.replace(/(\*\*|__)(.*?)\1/g, "$2"); //Markdown bold + message.text = message.text.replace(/(\*|_)(.*?)\1/g, "$2"); //Markdown italic if (message.sender === myUsername) { return '' + message.sender + ': ' + message.text;