Don't use WindowsException.

[irc/quakenet/qwebirc.git] / js / ui / baseui.js

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index f6707ea121c4c5f388bed5a3b560994bf0432bd2..cac20c241d752c7f0c2e23a2d824843627b7ecc0 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -284,6 +284,13 @@ qwebirc.ui.StandardUI = new Class({
     if(name == "options")
       return ["a", this.optionsWindow.bind(this)];
 
+    /* doesn't really belong here */
+    if(name == "whois") {
+      return ["span", function(nick) {
+        this.client.exec("/WHOIS " + nick);
+      }.bind(window)];
+    }
+
     return null;
   },
   tabComplete: function(element) {
@@ -330,19 +337,29 @@ qwebirc.ui.SoundUI = new Class({
   }
 });
 
-qwebirc.ui.QuakeNetUI = new Class({
+qwebirc.ui.NewLoginUI = new Class({
   Extends: qwebirc.ui.SoundUI,
+  loginBox: function(callbackfn, initialNickname, initialChannels, autoConnect, autoNick) {
+    this.postInitialize();
+
+    var w = this.newCustomWindow("Connect", true, qwebirc.ui.WINDOW_CONNECT);
+    var callback = function(args) {
+      w.close();
+      callbackfn(args);
+    };
+    
+    qwebirc.ui.GenericLoginBox(w.lines, callback, initialNickname, initialChannels, autoConnect, autoNick, this.options.networkName);
+  }
+});
+
+qwebirc.ui.QuakeNetUI = new Class({
+  Extends: qwebirc.ui.NewLoginUI,
   urlDispatcher: function(name, window) {
     if(name == "qwhois") {
       return ["span", function(auth) {
         this.client.exec("/MSG Q whois #" + auth);
       }.bind(window)];
     }
-    if(name == "whois") {
-      return ["span", function(nick) {
-        this.client.exec("/WHOIS " + nick);
-      }.bind(window)];
-    }
     return this.parent(name);
   },
   logout: function() {
@@ -359,18 +376,3 @@ qwebirc.ui.QuakeNetUI = new Class({
     }
   }
 });
-
-qwebirc.ui.NewLoginUI = new Class({
-  Extends: qwebirc.ui.QuakeNetUI,
-  loginBox: function(callbackfn, initialNickname, initialChannels, autoConnect, autoNick) {
-    this.postInitialize();
-
-    var w = this.newCustomWindow("Connect", true, qwebirc.ui.WINDOW_CONNECT);
-    var callback = function(args) {
-      w.close();
-      callbackfn(args);
-    };
-    
-    qwebirc.ui.GenericLoginBox(w.lines, callback, initialNickname, initialChannels, autoConnect, autoNick, this.options.networkName);
-  }
-});