Scrolling now works in IE.

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

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index f90b9b6de2ec8709abefce023453d12d6260ce5c..ea507f56928ca574ae7e88f5cfd19a0eccf49d2f 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -66,7 +66,9 @@ var BaseUI = new Class({
         this.windowArray = [];
       } else {
         var index = this.windowArray.indexOf(window);
-        if(index == 0) {
+        if(index == -1) {
+          return;
+        } else if(index == 0) {
           this.selectWindow(this.windowArray[1]);
         } else {
           this.selectWindow(this.windowArray[index - 1]);
@@ -87,37 +89,6 @@ var BaseUI = new Class({
     */
   loginBox: function(callback, initialNickname, initialChannels, autoConnect, autoNick) {
     GenericLoginBox(this.parentElement, callback, initialNickname, initialChannels, autoConnect, autoNick);
-    /*if(autoConnect) {
-      var c = initialChannels.split(",");
-      var ctext;
-      
-      if(c.length > 1) {
-        var last = c.pop();
-        ctext = c.join(", ") + " and " + last;
-      } else {
-        ctext = c[0];
-      }
-      
-      var nicktext;
-      if(autoNick) {
-        nicktext = "";
-      } else {
-        nicktext = " (as '" + initialNickname + "')"
-      }
-      if(confirm("Connect to IRC and join channels " + ctext + nicktext + "?"))
-        callback({"nickname": initialNickname, "autojoin": initialChannels});
-      return;
-    }
-
-    var nick = prompt("Nickname:", initialNickname);
-    if(!nick) {
-      alert("Aborted.");
-      return;
-    }
-
-    var chans = prompt("Channels (seperate by comma):", initialChannels);
-    callback({"nickname": nick, "autojoin": chans});
-    */
   }
 });
 
@@ -164,7 +135,7 @@ var UI = new Class({
     
     if(select)
       this.selectWindow(w);  
-      
+
     return w;
   },
   embeddedWindow: function() {
@@ -173,7 +144,7 @@ var UI = new Class({
       return;
     }
     
-    this.embedded = this.newCustomWindow("Embedded wizard", true);
+    this.embedded = this.newCustomWindow("Embedding wizard", true);
     this.embedded.addEvent("close", function() {
       this.embedded = null;
     }.bind(this));
@@ -190,3 +161,17 @@ var UI = new Class({
     return null;
   }
 });
+
+var NewLoginUI = new Class({
+  Extends: UI,
+  loginBox: function(callbackfn, initialNickname, initialChannels, autoConnect, autoNick) {
+    this.postInitialize();
+    var w = this.newCustomWindow("Connect", true, WINDOW_CONNECT);
+    var callback = function(args) {
+      w.close();
+      callbackfn(args);
+    };
+    
+    GenericLoginBox(w.lines, callback, initialNickname, initialChannels, autoConnect, autoNick);
+  }
+});