Don't prompt for navigation away from the page if iris is currently d…

…isconnected from the IRC server. Based upon qwebirc commit 28e7d1238045.
Snoonet · May 29, 2012 · dff7b35 · dff7b35
1 parent 6f6304b
commit dff7b35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
@@ -446,6 +446,7 @@ qwebirc.irc.IRCClient = new Class({
     }
     this.tracker = undefined;
 
+    qwebirc.connected = false;
     this.newServerLine("DISCONNECT", {"m": message});
   },
   nickOnChanHasPrefix: function(nick, channel, prefix) {
@@ -493,6 +494,7 @@ qwebirc.irc.IRCClient = new Class({
     this.parent(key, value);
   },
   connected: function() {
+    qwebirc.connected = true;
     this.newServerLine("CONNECT");
   },
   serverError: function(message) {

diff --git a/js/qwebirc.js b/js/qwebirc.js
@@ -1,4 +1,4 @@
-var qwebirc = {ui: {themes: {}, style: {}}, irc: {}, util: {crypto: {}}, config: {}, options: {}, auth: {}, sound: {}};
+var qwebirc = {ui: {themes: {}, style: {}}, irc: {}, util: {crypto: {}}, config: {}, options: {}, auth: {}, sound: {}, connected: false};
 var conf = null;
 var ui = null;
 

diff --git a/js/ui/create.js b/js/ui/create.js
@@ -34,9 +34,11 @@ qwebirc.ui.create = function(element, uiclass) {
 
 /* Displays a warning if the user tries to close their browser. */
 qwebirc.ui.onbeforeunload = function(e) { /* IE sucks */
-  var message = "This action will close all active IRC connections.";
-  var e = e || window.event;
-  if(e)
-    e.returnValue = message;
-  return message;
+  if (qwebirc.connected) {
+    var message = "This action will close all active IRC connections.";
+    var e = e || window.event;
+    if(e)
+      e.returnValue = message;
+    return message;
+  }
 };