Fix various logged in issues with autojoining.

Fix IE7 w/ options (extra comma again...)

diff --git a/TODO.txt b/TODO.txt
index 38c29ba92ef170cf538dcbe7d96d0db84607fa53..db19ba875cf98ff35403f20a79c9cf73fbc1c84d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,16 +10,17 @@ UI:
   TIDY: warning/info messages should have their colour decided by CSS\r
   FEAT: privacy policy\r
   TIDY: connect dialog offset looks non-centred\r
+  FEAT: MODE x +i -> Your user modes are now +i\r
   \r
 Authing:\r
   TIDY: Finish integration (notably login button on non-autoconnect page).\r
   TIDY: Login button should save state on form.\r
   TIDY: Fix up state inconsistency if backend is restarted (state is stored in user cookie and not refreshed except on login).\r
   FEAT: bind qticket to session to prevent ticket reuse within time limit.\r
+  FEAT: on startup: if autojoin channels exist and Q invites then the autojoin channels should be focused rather than the Q invited ones.\r
   \r
 IRC:  \r
   TIDY: /msg $ goes to status, as does /notice $, should go to active.\r
-  FEAT: auto accept Q invites\r
   \r
 Options pane:\r
   FEAT: Store options server side when logged in.\r

diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index afaa5a25f83d89df50a259fd8ba6c960f791fc15..fa2e2db3cc1712c891270803a75a577e7ea5224e 100644 (file)
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -197,8 +197,8 @@ qwebirc.irc.IRCClient = new Class({
     if(this.ui.uiOptions.USE_HIDDENHOST)
       this.exec("/UMODE +x");
       
-    if(qwebirc.auth.loggedin && this.options.autojoin) {
-      if(this.ui.uiOptions.USE_HIDDENHOST) {
+    if(this.options.autojoin) {
+      if(qwebirc.auth.loggedin() && this.ui.uiOptions.USE_HIDDENHOST) {
         var d = function() {
           if($defined(this.activeTimers.autojoin))
             this.ui.getActiveWindow().infoMessage("Waiting for login before joining channels...");
@@ -208,9 +208,10 @@ qwebirc.irc.IRCClient = new Class({
           w.errorMessage("No login response in 10 seconds.");
           w.errorMessage("You may want to try authing to Q and then type: /autojoin (if you don't auth your host may be visible).");
         }.delay(10000, this);
-      } else {
-        this.exec("/AUTOJOIN");
+        return;
       }
+
+      this.exec("/AUTOJOIN");
     }
   },
   userJoined: function(user, channel) {

diff --git a/js/ui/optionspane.js b/js/ui/optionspane.js
index 42ce76193e2c2e153af5684e7ac985f7b5065e77..28509883778f4b6946bdc51730ee649ff0faca84 100644 (file)
--- a/js/ui/optionspane.js
+++ b/js/ui/optionspane.js
@@ -19,7 +19,7 @@ qwebirc.config.DEFAULT_OPTIONS = [
   [4, "DEDICATED_NOTICE_WINDOW", "Send notices to dedicated message window", false],
   [3, "NICK_OV_STATUS", "Show status (@/+) before nicknames", true],
   [5, "ACCEPT_SERVICE_INVITES", "Automatically join channels when invited by Q", true],
-  [6, "USE_HIDDENHOST", "Hide your hostmask when authed to Q (+x)", true],
+  [6, "USE_HIDDENHOST", "Hide your hostmask when authed to Q (+x)", true]
 ];
 
 qwebirc.config.DefaultOptions = null;