From 541f31959ad8abf02580628587a8fe80145ddba8 Mon Sep 17 00:00:00 2001 From: Inferno42 Date: Sat, 11 Jul 2015 01:16:36 -0400 Subject: [PATCH 1/2] Added name highlighting --- client/client.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/client.js b/client/client.js index 4f10de2..fbe3f92 100644 --- a/client/client.js +++ b/client/client.js @@ -107,6 +107,14 @@ var COMMANDS = { else if (myNick == args.nick) { cls = 'me' } + else if (myNick != args.nick) + { + var re = new RegExp(myNick) + if(re.test(args.text)) + { + args.text = args.text.replace(myNick, "$\\red{" + myNick + "}$") + } + } pushMessage(args.nick, args.text, args.time, cls) }, info: function(args) { @@ -286,4 +294,4 @@ function loadScheme() { setScheme(name) } } -} \ No newline at end of file +} From 695a61ace968782f3276dd48c0cfdf7b208ccc03 Mon Sep 17 00:00:00 2001 From: Christian Little Date: Sat, 11 Jul 2015 17:12:44 -0400 Subject: [PATCH 2/2] Update client.js --- client/client.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/client.js b/client/client.js index 788ac76..cc64fcd 100644 --- a/client/client.js +++ b/client/client.js @@ -371,8 +371,6 @@ if (localStorage) { setScheme(scheme) } } -<<<<<<< HEAD -======= $('#scheme-selector').value = currentScheme ->>>>>>> upstream/master +