Merge.

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

diff --git a/js/qwebircinterface.js b/js/qwebircinterface.js
index f4d608c5f153f55ca62d65be6368f02d263de88d..fa7b4765bc489cabd846f8a590e87dd06ec137f3 100644 (file)
--- a/js/qwebircinterface.js
+++ b/js/qwebircinterface.js
@@ -35,7 +35,15 @@ qwebirc.ui.Interface = new Class({
   initialize: function(element, ui, options) {
     this.setOptions(options);
     var extractHost = function() {
-      var uri = document.location.origin + document.location.pathname;
+      var uri = document.location.href;
+
+      /* IE6 doesn't have document.origin ... */
+      var start = uri.indexOf('?');
+      if(start != -1)
+        uri = uri.substring(0, start);
+      var start = uri.indexOf('#');
+      if(start != -1)
+        uri = uri.substring(0, start);
 
       if(QWEBIRC_DEBUG && uri.endsWith(".html")) {
         var last = uri.lastIndexOf("/");