Fix colour and $ bugs.

[irc/quakenet/qwebirc.git] / static / js / ui / colour.js

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