Fix UI type hierarchy regression.

* * *
Fix another url regression.

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index cac20c241d752c7f0c2e23a2d824843627b7ecc0..a61da847a4c67b9609d0a4f243452d6b9247fc2f 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -277,7 +277,7 @@ qwebirc.ui.StandardUI = new Class({
   faqWindow: function() {
     this.addCustomWindow("FAQ", qwebirc.ui.FAQPane, "faqpane", this.uiOptions);
   },
-  urlDispatcher: function(name) {
+  urlDispatcher: function(name, window) {
     if(name == "embedded")
       return ["a", this.embeddedWindow.bind(this)];
       
@@ -360,7 +360,7 @@ qwebirc.ui.QuakeNetUI = new Class({
         this.client.exec("/MSG Q whois #" + auth);
       }.bind(window)];
     }
-    return this.parent(name);
+    return this.parent(name, window);
   },
   logout: function() {
     if(!qwebirc.auth.loggedin())
@@ -376,3 +376,5 @@ qwebirc.ui.QuakeNetUI = new Class({
     }
   }
 });
+
+qwebirc.ui.RootUI = qwebirc.ui.QuakeNetUI;

diff --git a/js/ui/frontends/mochaui.js b/js/ui/frontends/mochaui.js
index dbaea0867b419e6152a9ef403beb965548c95e3e..80a5cc95268fdf7e101e3fb27645da8002cc602d 100644 (file)
--- a/js/ui/frontends/mochaui.js
+++ b/js/ui/frontends/mochaui.js
@@ -1,5 +1,5 @@
 qwebirc.ui.MochaUI = new Class({
-  Extends: qwebirc.ui.NewLoginUI,
+  Extends: qwebirc.ui.RootUI,
   initialize: function(parentElement, theme, options) {
     this.parent(parentElement, qwebirc.ui.MochaUI.Window, "mochaui");
     this.theme = theme;

diff --git a/js/ui/frontends/qui.js b/js/ui/frontends/qui.js
index 31f8b2e1e56af3617c04fe51226a79a91255557f..a5557029d3a6414d327db0516708253cb667b79c 100644 (file)
--- a/js/ui/frontends/qui.js
+++ b/js/ui/frontends/qui.js
@@ -1,5 +1,5 @@
 qwebirc.ui.QUI = new Class({
-  Extends: qwebirc.ui.NewLoginUI,
+  Extends: qwebirc.ui.RootUI,
   initialize: function(parentElement, theme, options) {
     this.parent(parentElement, qwebirc.ui.QUI.Window, "qui", options);
     this.theme = theme;

diff --git a/js/ui/frontends/swmui.js b/js/ui/frontends/swmui.js
index 28045528b179ee9894ece78436f868dd6ea099bf..1fb2643769fdc70db9705e5e78f4ba0624267179 100644 (file)
--- a/js/ui/frontends/swmui.js
+++ b/js/ui/frontends/swmui.js
@@ -1,5 +1,5 @@
 qwebirc.ui.SWMUI = new Class({
-  Extends: qwebirc.ui.NewLoginUI,
+  Extends: qwebirc.ui.RootUI,
   initialize: function(parentElement, theme, options) {
     this.parent(parentElement, qwebirc.ui.SWMUI.Window, "swmui", options);
 

diff --git a/js/ui/frontends/uglyui.js b/js/ui/frontends/uglyui.js
index 342e11286059920b47797d9ad18960e03eadcc56..c455c5da90c99b1340253447a37c9913b3ac5146 100644 (file)
--- a/js/ui/frontends/uglyui.js
+++ b/js/ui/frontends/uglyui.js
@@ -1,5 +1,5 @@
 qwebirc.ui.UglyUI = new Class({
-  Extends: qwebirc.ui.NewLoginUI,
+  Extends: qwebirc.ui.RootUI,
   initialize: function(parentElement, theme, options) {
     this.parent(parentElement, qwebirc.ui.UglyUI.Window, "uglyui", options);
     this.theme = theme;