Fix feedback backspace not-working bug.

[irc/quakenet/qwebirc.git] / js / qwebircinterface.js

diff --git a/js/qwebircinterface.js b/js/qwebircinterface.js
index 8f9562610761e2d157cd77d9c52fafb49bf43ff1..c525a2ca84bb15c304dd9e17a3f503fcd0f006a0 100644 (file)
--- a/js/qwebircinterface.js
+++ b/js/qwebircinterface.js
@@ -1,8 +1,12 @@
-var QWebIRCInterface = new Class({
+qwebirc.ui.Interface = new Class({
   Implements: [Options],
   options: {
     initialNickname: "qwebirc" + Math.ceil(Math.random() * 100000),
     initialChannels: "",
+    networkName: "QuakeNet",
+    networkServices: ["Q!TheQBot@QuakeNet.org"],
+    loginRegex: "^You are now logged in as [^ ]+\\.$",
+    appTitle: "QuakeNet Web IRC",
     searchURL: true,
     theme: undefined
   },
@@ -10,28 +14,32 @@ var QWebIRCInterface = new Class({
     this.setOptions(options);
 
     window.addEvent("domready", function() {
-      var ui_ = new ui($(element), new Theme(this.options.theme));
-      var inick = this.options.initialNickname;
-      var ichans = this.options.initialChannels;
-      var autoNick = true;
+      var ui_ = new ui($(element), new qwebirc.ui.Theme(this.options.theme), this.options);
       
       var callback = function(options) {
-        var IRC = new IRCClient(options, ui_);
+        var IRC = new qwebirc.irc.IRCClient(options, ui_);
         IRC.connect();
         window.addEvent("beforeunload", function() {
           IRC.quit("Page closed");
         });
       };
 
-      var supplied = false; 
+      var inick = null;
+      var ichans = this.options.initialChannels;
+      var autoConnect = false;
+      
       if(this.options.searchURL) {
-        var args = parseURI(String(document.location));
+        var args = qwebirc.util.parseURI(String(document.location));
         
         var chans = args["channels"];
         var nick = args["nick"];
 
+        var canAutoConnect = false;
+        
         if(chans) {
-          chans = chans.split(",");
+          var cdata = chans.split(" ");
+          
+          chans = cdata[0].split(",");
           var chans2 = [];
           
           for(i=0;i<chans.length;i++) {
@@ -40,17 +48,45 @@ var QWebIRCInterface = new Class({
             if(chans[i].charAt(0) != '#')
               chans2[i] = "#" + chans2[i]
           }
-          ichans = chans2.join(",");
-          supplied = true;
+          cdata[0] = chans2.join(",");
+          ichans = cdata.join(" ");
+          canAutoConnect = true;
         }
         
-        if(nick) {
+        if($defined(nick))
           inick = nick;
-          autoNick = false;
+        
+        if(args["randomnick"] && args["randomnick"] == 1)
+          inick = this.options.initialNickname;
+          
+        /* we only consider autoconnecting if the nick hasn't been supplied, or it has and it's not "" */
+        if(canAutoConnect && (!$defined(inick) || ($defined(inick) && (inick != "")))) {
+          var p = args["prompt"];
+          var pdefault = false;
+          
+          if(!$defined(p) || p == "") {
+            pdefault = true;
+            p = false;
+          } else if(p == "0") {
+            p = false;
+          } else {
+            p = true;
+          }
+          
+          /* autoconnect if we have channels and nick but only if prompt != 1 */
+          if($defined(inick) && !p) {
+            autoConnect = true;
+          } else if(!pdefault && !p) { /* OR if prompt=0, but not prompt=(nothing) */
+            autoConnect = true;
+          }
         }
       }
-
-      var details = ui_.loginBox(callback, inick, ichans, supplied, autoNick);
+  
+      var usingAutoNick = !$defined(nick);
+      if(usingAutoNick && autoConnect)
+        inick = this.options.initialNickname;
+      
+      var details = ui_.loginBox(callback, inick, ichans, autoConnect, usingAutoNick);
     }.bind(this));
   }
 });