Fix uglyui, also reorganise loginbox.

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index 5ac3fed75797e9b7e3e360188c135a95eca69c33..08a28cdcf361d8f75135f85c73217563287f39e2 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -105,10 +105,6 @@ var UI = new Class({
     }
 
     var chans = prompt("Channels (seperate by comma):", "#quakenetX");
-    if(chans) {
-      callback(nick, chans);
-    } else {
-      callback(nick);
-    }
+    callback({"nickname": nick, "autojoin": chans});
   }
 });

diff --git a/js/ui/swmui.js b/js/ui/swmui.js
index 38f1c097eb31be813c240cf4cfa7fcaaabac643e..5c5b2060c3f21877b692eec889ca5e6208d625f7 100644 (file)
--- a/js/ui/swmui.js
+++ b/js/ui/swmui.js
@@ -233,7 +233,7 @@ var SWMUI = new Class({
 
       this.parentElement.removeChild(box);
       this.postInitialize();
-      callback(nickname, chans);
+      callback({"nickname": nickname, "autojoin": chans});
     }.bind(this));
 
     box.appendChild(form);

diff --git a/js/ui/uglyui.js b/js/ui/uglyui.js
index d2a50313834996152e42b04e50d3d3fa9a2862f0..b7818a7c9eb92621a1ddf5f4551103b1d23c5102 100644 (file)
--- a/js/ui/uglyui.js
+++ b/js/ui/uglyui.js
@@ -137,18 +137,19 @@ var UglyUI = new Class({
   Extends: UI,
   initialize: function(parentElement, theme) {
     this.parent(parentElement, UglyUIWindow, "uglyui");
-    
     this.theme = theme;
-    
+    this.parentElement = parentElement;
+  },
+  postInitialize: function() {    
     this.tabs = new Element("div");
     this.tabs.addClass("tabbar");
     
-    parentElement.appendChild(this.tabs);
+    this.parentElement.appendChild(this.tabs);
     
     this.container = new Element("div");
     this.container.addClass("container");
     
-    parentElement.appendChild(this.container);
+    this.parentElement.appendChild(this.container);
   
     var form = new Element("form");
     var inputbox = new Element("input");
@@ -160,8 +161,15 @@ var UglyUI = new Class({
       this.getActiveWindow().client.exec(inputbox.value);
       inputbox.value = "";
     }.bind(this));
-    parentElement.appendChild(form);  
+    this.parentElement.appendChild(form);  
     form.appendChild(inputbox);
     inputbox.focus();
+  },
+  loginBox: function(callbackfn) {
+    this.parent(function(options) {
+      this.postInitialize();
+      callbackfn(options);
+    }.bind(this));
   }
-});
\ No newline at end of file
+});
+

diff --git a/static/swmui.html b/static/swmui.html
index e1b73709c186c1d757fc0b2f822d15aa2bd9e445..b980c8f555e060692f25ae23dcc2b63882004d89 100644 (file)
--- a/static/swmui.html
+++ b/static/swmui.html
@@ -28,10 +28,10 @@
 
       /* TODO: look at URI and detect nickname/channels... */
 
-      var details = ui.loginBox(function(nickname, channels) {
-        var IRC = new IRCClient({nickname: nickname, "autojoin": channels}, ui);
+      var details = ui.loginBox(function(options) {
+        var IRC = new IRCClient(options, ui);
         IRC.connect();
-      })
+      });
     });
   </script>
 </head>

diff --git a/static/swmuidebug.html b/static/swmuidebug.html
index c1abc8ed1e16839ba4c8fb4fdcf9d21ab7b05b64..04067edc717fa2475b2c780a502e1794ccc82eac 100644 (file)
--- a/static/swmuidebug.html
+++ b/static/swmuidebug.html
@@ -28,10 +28,10 @@
 
       /* TODO: look at URI and detect nickname/channels... */
 
-      var details = ui.loginBox(function(nickname, channels) {
-        var IRC = new IRCClient({nickname: nickname, "autojoin": channels}, ui);
+      var details = ui.loginBox(function(options) {
+        var IRC = new IRCClient(options, ui);
         IRC.connect();
-      })
+      });
     });
   </script>
 </head>

diff --git a/static/uglyui.html b/static/uglyui.html
index d142830a5a622b56ed1f98478b2894a228e6201d..23b9c420930337c3401fc330c7947913e63a87a7 100644 (file)
--- a/static/uglyui.html
+++ b/static/uglyui.html
@@ -27,10 +27,10 @@
 
       /* TODO: look at URI and detect nickname/channels... */
 
-      var details = ui.loginBox(function(nickname, channels) {
-        var IRC = new IRCClient({nickname: nickname, "autojoin": channels}, ui);
+      var details = ui.loginBox(function(options) {
+        var IRC = new IRCClient(options, ui);
         IRC.connect();
-      })
+      });
     });
   </script>
 </head>

diff --git a/static/uglyuidebug.html b/static/uglyuidebug.html
index 64af88fc4a6da384e6ba8548b1f31f96e26cd7dd..4197244568b9d7a54a50cff66cbe98818bc2a525 100644 (file)
--- a/static/uglyuidebug.html
+++ b/static/uglyuidebug.html
@@ -27,10 +27,10 @@
 
       /* TODO: look at URI and detect nickname/channels... */
 
-      var details = ui.loginBox(function(nickname, channels) {
-        var IRC = new IRCClient({nickname: nickname, "autojoin": channels}, ui);
+      var details = ui.loginBox(function(options) {
+        var IRC = new IRCClient(options, ui);
         IRC.connect();
-      })
+      });
     });
   </script>
 </head>