X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/2cf88a5287918ad99407d175357614fe04544dbe..015ab79ac65cca3c99282e6c735412131f92e4f9:/js/qwebircinterface.js diff --git a/js/qwebircinterface.js b/js/qwebircinterface.js index f4d608c..4655e0f 100644 --- a/js/qwebircinterface.js +++ b/js/qwebircinterface.js @@ -28,14 +28,24 @@ qwebirc.ui.Interface = new Class({ tlightness: null, uiOptionsArg: null, nickValidation: null, - helpURL: null, dynamicBaseURL: "/", - staticBaseURL: "/" + staticBaseURL: "/", + cloak: false, + logoURL: null, + accountWhoisCommand: null }, 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("/"); @@ -54,12 +64,12 @@ qwebirc.ui.Interface = new Class({ dynamicBaseURL: options.dynamicBaseURL, staticBaseURL: options.staticBaseURL, baseURL: options.baseURL, - helpURL: options.helpURL, nicknameValidator: $defined(options.nickValidation) ? new qwebirc.irc.NicknameValidator(options.nickValidation) : new qwebirc.irc.DummyNicknameValidator() }; window.addEvent("domready", function() { var callback = function(options) { + options.cloak = ui_.options.cloak; var IRC = new qwebirc.irc.IRCClient(options, ui_); IRC.connect(); window.onbeforeunload = qwebirc_ui_onbeforeunload; @@ -121,7 +131,10 @@ qwebirc.ui.Interface = new Class({ if(args.contains("randomnick") && args.get("randomnick") == 1) inick = this.options.initialNickname; - + + if(args.contains("cloak") && args.get("cloak") == 1) + this.options.cloak = true; + /* 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.get("prompt");