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 55e6a6e1ef6598c983b06a745fdcb9e9d8056663..cac20c241d752c7f0c2e23a2d824843627b7ecc0 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -34,9 +34,9 @@ qwebirc.ui.BaseUI = new Class({
     if(!this.firstClient) {
       this.firstClient = true;
       w.addLine("", "qwebirc v" + qwebirc.VERSION);
-      w.addLine("", "Copyright (C) 2008-2009 Chris Porter. All rights reserved.");
-      w.addLine("", "http://webchat.quakenet.org/");
-      w.addLine("", "This is BETA quality software, please report bugs to slug@quakenet.org");
+      w.addLine("", "Copyright (C) 2008-2009 Chris Porter and the qwebirc project.");
+      w.addLine("", "http://www.qwebirc.org");
+      w.addLine("", "Licensed under the GNU General Public License, Version 2.");
     }
     return w;
   },
@@ -260,7 +260,7 @@ qwebirc.ui.StandardUI = new Class({
     d.setSubWindow(ew);
   },
   embeddedWindow: function() {
-    this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard");
+    this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard", {baseURL: this.options.baseURL});
   },
   optionsWindow: function() {
     this.addCustomWindow("Options", qwebirc.ui.OptionsPane, "optionspane", this.uiOptions);
@@ -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);
-  }
-});