Various things I missed.

diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js
index 45cca494da42eb78799ef5cc2c3d4836068c24a0..7ff8313fc0e1beac59b849a11ef8a68d0d74cbe2 100644 (file)
--- a/js/irc/commandparser.js
+++ b/js/irc/commandparser.js
@@ -25,7 +25,7 @@ qwebirc.irc.CommandParser = new Class({
       target = false;
       this.parentObject.newActiveLine("OUR" + type, extra);
       return;
-    } else if(window.type == WINDOW_CHANNEL) {
+    } else if(window.type == qwebirc.ui.WINDOW_CHANNEL) {
       type = "CHAN" + type;
     } else {
       type = "PRIV" + type;
@@ -66,7 +66,7 @@ qwebirc.irc.CommandParser = new Class({
       var fn = cmdopts[3];
       
       var w = this.parentObject.getActiveWindow();
-      if(activewin && w.type == WINDOW_STATUS) {
+      if(activewin && w.type == qwebirc.ui.WINDOW_STATUS) {
         w.errorMessage("Can't use this command in this window");
         return;
       }
@@ -134,7 +134,7 @@ qwebirc.irc.CommandParser = new Class({
       this.newTargetLine(target, "NOTICE", message);
   }],
   cmd_QUERY: [false, 2, 1, function(args) {
-    this.parentObject.newWindow(args[0], WINDOW_QUERY, true);
+    this.parentObject.newWindow(args[0], qwebirc.ui.WINDOW_QUERY, true);
 
     if((args.length > 1) && (args[1] != ""))
       return ["SAY", args[1]];

diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index 2d3f0b8a2cbd3460dbd20fb2ddb82dc1a0914c81..1d14327f45e7200dd5b1c733e42d4e43bb4a3cbc 100644 (file)
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -138,7 +138,7 @@ qwebirc.irc.IRCClient = new Class({
     var host = user.hostToHost();
     
     if((nick == this.nickname) && !this.getWindow(channel))
-      this.newWindow(channel, WINDOW_CHANNEL, true);
+      this.newWindow(channel, qwebirc.ui.WINDOW_CHANNEL, true);
     this.tracker.addNickToChannel(nick, channel);
 
     if(nick == this.nickname) {
@@ -262,7 +262,7 @@ qwebirc.irc.IRCClient = new Class({
       args = "";
     
     if(type == "ACTION") {      
-      this.newWindow(nick, WINDOW_QUERY);
+      this.newWindow(nick, qwebirc.ui.WINDOW_QUERY);
       this.newLine(nick, "PRIVACTION", {"m": args, "x": type, "h": host, "n": nick});
       return;
     }
@@ -295,7 +295,7 @@ qwebirc.irc.IRCClient = new Class({
     var nick = user.hostToNick();
     var host = user.hostToHost();
     
-    this.newWindow(nick, WINDOW_QUERY);
+    this.newWindow(nick, qwebirc.ui.WINDOW_QUERY);
     
     this.newLine(nick, "PRIVMSG", {"m": message, "h": host, "n": nick});
   },
@@ -350,7 +350,7 @@ qwebirc.irc.IRCClient = new Class({
   disconnected: function(message) {
     for(var x in this.windows) {
       var w = this.windows[x];
-      if(w.type == WINDOW_CHANNEL)
+      if(w.type == qwebirc.ui.WINDOW_CHANNEL)
         w.close();
     }
     this.tracker = undefined;