Fix ctcps going to wrong window.

Fix css overriding order problem in firefox.
Remove redundant arguments in addLine.

diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js
index 141ba643dd35cd9d82939c5cfff1908c7b4fa054..7952d650d0fa24782bb88b3ed0ea33d138a1d58f 100644 (file)
--- a/js/irc/commandparser.js
+++ b/js/irc/commandparser.js
@@ -23,6 +23,8 @@ var CommandParser = new Class({
     if(!window) {
       type = "TARGETED" + type;
       target = false;
+      this.parentObject.newActiveLine("OUR" + type, extra);
+      return;
     } else if(window.type == WINDOW_CHANNEL) {
       type = "CHAN" + type;
     } else {

diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
index a0c263215346c32208d7b486caf4dcb1dfeee0bd..2f5877fbaa0c53162268fabb71df75364a365257 100644 (file)
--- a/js/ui/baseuiwindow.js
+++ b/js/ui/baseuiwindow.js
@@ -44,10 +44,9 @@ var UIWindow = new Class({
 
     this.active = false;
   },
-  addLine: function(type, line, colour, element, parent, scrollparent) {
+  addLine: function(type, line, colour, element) {
     if(!this.active && !this.hilighted)
       this.setHilighted(true);
-    
     if(type)
       line = this.parentObject.theme.message(type, line);
     

diff --git a/static/css/qui.css b/static/css/qui.css
index b1c507044a3c9995457021fa76645bd4b42e9ae4..f733b17727b89cb58a8d08a224c622fa7d75f6e5 100644 (file)
--- a/static/css/qui.css
+++ b/static/css/qui.css
@@ -20,7 +20,7 @@
   color: #000000;
 }
 
-.qwebirc-qui a.tab:visited {
+.qwebirc-qui tab:visited {
   color: #000000;
 }
 
@@ -90,7 +90,7 @@
   background: #eeffff;
 }*/
 
-.qwebirc-qui .tab-hilighted {
+.qwebirc-qui a.tab-hilighted {
   color: red;
 }