Fix colour and $ bugs.

diff --git a/static/js/irc/baseirc.js b/static/js/irc/baseirc.js
index 51fd3617fe701391766d0f5db22853fa67878eb8..0a97712a8a7956f714c22e457419ae61de8c50f6 100644 (file)
--- a/static/js/irc/baseirc.js
+++ b/static/js/irc/baseirc.js
@@ -84,6 +84,7 @@ function BaseIRCClient(nickname, view) {
     var user = prefix;\r
     var channel = params[0];\r
     var message = params[1];\r
+\r
     var nick = hosttonick(user);\r
     \r
     if((nick == self.nickname) && self.channels[channel])\r

diff --git a/static/js/irc/ircclient.js b/static/js/irc/ircclient.js
index 46e3173750f35743a720dd6df8b9815cfd156ef8..2e68763eb5eff5bf6a609650e22f5bc7dbfc0a93 100644 (file)
--- a/static/js/irc/ircclient.js
+++ b/static/js/irc/ircclient.js
@@ -89,11 +89,9 @@ function IRCClient(nickname, ui) {
       self.tracker.removeChannel(channel);\r
     } else {\r
       self.tracker.removeNickFromChannel(nick, channel);\r
+      newChanLine(channel, "PART", user, {"m": message});\r
     }\r
-    \r
-    if(!message)\r
-      message = "";\r
-    newChanLine(channel, "PART", user, {"m": message});\r
+  \r
     self.updateNickList(channel);\r
     \r
     if(nick == self.nickname)\r
@@ -108,8 +106,6 @@ function IRCClient(nickname, ui) {
       self.tracker.removeNickFromChannel(kickee, channel);\r
       self.updateNickList(channel);\r
     }\r
-    if(!message)\r
-      message = "";\r
       \r
     newChanLine(channel, "KICK", kicker, {"v": kickee, "m": message});\r
   }\r

diff --git a/static/js/ui/colour.js b/static/js/ui/colour.js
index 460e98fb1bda21792ed25cad21fbe736aa11d5fe..9599668d5e433565815eb8d365cc9e064712efbe 100644 (file)
--- a/static/js/ui/colour.js
+++ b/static/js/ui/colour.js
@@ -20,10 +20,10 @@ function colourise(line, entity) {
     }\r
     i++;\r
     if(isnum(xline[i + 1])) {\r
-      fg = xline[i] + xline[i + 1];\r
+      fg = parseInt(xline[i] + xline[i + 1]);\r
       i++;\r
     } else {\r
-      fg = xline[i];\r
+      fg = parseInt(xline[i]);\r
     }\r
     if(xline[i + 1] != ",")\r
       return i;\r
@@ -32,10 +32,10 @@ function colourise(line, entity) {
     i+=2;\r
     \r
     if(isnum(xline[i + 1])) {\r
-      bg = xline[i] + xline[i + 1];\r
+      bg = parseInt(xline[i] + xline[i + 1]);\r
       i++;\r
     } else {\r
-      bg = xline[i];\r
+      bg = parseInt(xline[i]);\r
     }\r
     return i;\r
   }\r
@@ -83,6 +83,10 @@ function colourise(line, entity) {
       ac();\r
       \r
       i = parsecolours(xline, i);\r
+      if(bg > 15)\r
+        bg = undefined;\r
+      if(fg > 15)\r
+        fg = undefined;\r
       pc();\r
     } else {\r
       out.push(lc);\r

diff --git a/static/js/ui/theme.js b/static/js/ui/theme.js
index 21f13559cc5a0d1c817406f2b43ada15fe195374..e3d2a05ca03342f7312f5043bdd22fbb00acc82b 100644 (file)
--- a/static/js/ui/theme.js
+++ b/static/js/ui/theme.js
@@ -39,12 +39,10 @@ function Theme(values) {
         var c2 = n[++i];\r
 \r
         var o = ThemeControlCodeMap[c2];\r
-        if(!o) {\r
+        if(!o)\r
           o = h[c2];\r
-          if(!o)\r
-            o = c;\r
-        }\r
-        msg.push(o);\r
+        if(o)\r
+          msg.push(o);\r
       } else {\r
         msg.push(c);\r
       }\r