X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/1f4600deaf7a25f4fb2f1844edc865e8518a8fdc..e87f992490f18ee8db4b9b9cace4ea8558e74818:/js/ui/baseui.js diff --git a/js/ui/baseui.js b/js/ui/baseui.js index 8be4788..db461ac 100644 --- a/js/ui/baseui.js +++ b/js/ui/baseui.js @@ -47,6 +47,14 @@ qwebirc.ui.BaseUI = new Class({ document.addEvent("focus", focus); window.addEvent("focus", focus); } + + qwebirc.util.__log = function(x) { + if(QWEBIRC_DEBUG) { + if(typeof console != "undefined") + console.log(x); + this.getActiveWindow().addLine(null, x); + } + }.bind(this); }, newClient: function(client) { client.id = this.clientId++; @@ -59,7 +67,7 @@ qwebirc.ui.BaseUI = new Class({ if(!this.firstClient) { this.firstClient = true; w.addLine("", "qwebirc v" + qwebirc.VERSION); - w.addLine("", "Copyright (C) 2008-2009 Chris Porter and the qwebirc project."); + w.addLine("", "Copyright (C) 2008-2012 Chris Porter and the qwebirc project."); w.addLine("", "http://www.qwebirc.org"); w.addLine("", "Licensed under the GNU General Public License, Version 2."); } @@ -114,6 +122,29 @@ qwebirc.ui.BaseUI = new Class({ __setActiveWindow: function(window) { this.active = window; }, + renameWindow: function(window, name) { + if(this.getWindow(window.client, window.type, name)) + return null; + + var clientId = this.getClientId(window.client); + var index = this.windowArray.indexOf(window); + if(index == -1) + return null; + + delete this.windows[clientId][window.identifier]; + + var window = this.windowArray[index]; + window.name = name; + window.identifier = this.getWindowIdentifier(window.client, window.type, window.name); + + this.windows[clientId][window.identifier] = this.windowArray[index]; + + if(window.active) + this.updateTitle(window.name + " - " + this.options.appTitle); + + window.rename(window.name); + return window; + }, selectWindow: function(window) { if(this.active) this.active.deselect(); @@ -190,9 +221,18 @@ qwebirc.ui.StandardUI = new Class({ this.parent(parentElement, windowClass, uiName, options); this.tabCompleter = new qwebirc.ui.TabCompleterFactory(this); - this.uiOptions = new qwebirc.ui.DefaultOptionsClass(this); + this.uiOptions = new qwebirc.ui.DefaultOptionsClass(this, options.uiOptionsArg); this.customWindows = {}; + this.__styleValues = {hue: this.uiOptions.STYLE_HUE, saturation: 0, lightness: 0}; + if($defined(this.options.hue)) this.__styleValues.hue = this.options.hue; + if($defined(this.options.saturation)) this.__styleValues.saturation = this.options.saturation; + if($defined(this.options.lightness)) this.__styleValues.lightness = this.options.lightness; + + if(this.options.thue !== null) this.__styleValues.textHue = this.options.thue; + if(this.options.tsaturation !== null) this.__styleValues.textSaturation = this.options.tsaturation; + if(this.options.tlightness !== null) this.__styleValues.textLightness = this.options.tlightness; + var ev; if(Browser.Engine.trident) { ev = "keydown"; @@ -293,7 +333,9 @@ qwebirc.ui.StandardUI = new Class({ d.setSubWindow(ew); }, embeddedWindow: function() { - this.addCustomWindow("Embedding wizard", qwebirc.ui.EmbedWizard, "embeddedwizard", {baseURL: this.options.baseURL}); + this.addCustomWindow("Add webchat to your site", qwebirc.ui.EmbedWizard, "embeddedwizard", {baseURL: this.options.baseURL, uiOptions: this.uiOptions, optionsCallback: function() { + this.optionsWindow(); + }.bind(this)}); }, optionsWindow: function() { this.addCustomWindow("Options", qwebirc.ui.OptionsPane, "optionspane", this.uiOptions); @@ -320,8 +362,12 @@ qwebirc.ui.StandardUI = new Class({ /* doesn't really belong here */ if(name == "whois") { return ["span", function(nick) { - this.client.exec("/WHOIS " + nick); - }.bind(window)]; + if(this.uiOptions.QUERY_ON_NICK_CLICK) { + window.client.exec("/QUERY " + nick); + } else { + window.client.exec("/WHOIS " + nick); + } + }.bind(this)]; } return null; @@ -333,20 +379,41 @@ qwebirc.ui.StandardUI = new Class({ this.tabCompleter.reset(); }, setModifiableStylesheet: function(name) { - this.__styleSheet = new qwebirc.ui.style.ModifiableStylesheet("/css/" + name + qwebirc.FILE_SUFFIX + ".mcss"); - - if($defined(this.options.hue)) { - this.setModifiableStylesheetValues(this.options.hue, 0, 0); - } else { - this.setModifiableStylesheetValues(this.uiOptions.STYLE_HUE, 0, 0); - } + this.__styleSheet = new qwebirc.ui.style.ModifiableStylesheet(qwebirc.global.staticBaseURL + "css/" + name + qwebirc.FILE_SUFFIX + ".mcss"); + this.setModifiableStylesheetValues({}); }, - setModifiableStylesheetValues: function(hue, saturation, lightness) { + setModifiableStylesheetValues: function(values) { + for(var k in values) + this.__styleValues[k] = values[k]; + if(!$defined(this.__styleSheet)) return; - this.__styleSheet.set(function(x) { - return x.setHue(hue).setSaturation(x.hsb[1] + saturation).setBrightness(x.hsb[2] + lightness); - }); + + var back = {hue: this.__styleValues.hue, lightness: this.__styleValues.lightness, saturation: this.__styleValues.saturation}; + var front = {hue: this.__styleValues.textHue, lightness: this.__styleValues.textLightness, saturation: this.__styleValues.textSaturation}; + + if(!this.__styleValues.textHue && !this.__styleValues.textLightness && !this.__styleValues.textSaturation) + front = back; + + var colours = { + back: back, + front: front + }; + + this.__styleSheet.set(function() { + var mode = arguments[0]; + if(mode == "c") { + var t = colours[arguments[2]]; + var x = new Color(arguments[1]); + var c = x.setHue(t.hue).setSaturation(x.hsb[1] + t.saturation).setBrightness(x.hsb[2] + t.lightness); + if(c == "255,255,255") /* IE confuses white with transparent... */ + c = "255,255,254"; + + return "rgb(" + c + ")"; + } else if(mode == "o") { + return this.uiOptions[arguments[1]] ? arguments[2] : arguments[3]; + } + }.bind(this)); } }); @@ -382,7 +449,8 @@ qwebirc.ui.NewLoginUI = new Class({ loginBox: function(callbackfn, initialNickname, initialChannels, autoConnect, autoNick) { this.postInitialize(); - var w = this.newCustomWindow("Connection Details", true, qwebirc.ui.WINDOW_CONNECT); + /* I'd prefer something shorter and snappier! */ + var w = this.newCustomWindow("Connection details", true, qwebirc.ui.WINDOW_CONNECT); var callback = function(args) { w.close(); callbackfn(args); @@ -411,10 +479,56 @@ qwebirc.ui.QuakeNetUI = new Class({ }; /* HACK */ - var foo = function() { document.location = "/auth?logout=1"; }; + var foo = function() { document.location = qwebirc.global.dynamicBaseURL + "auth?logout=1"; }; foo.delay(500); } } }); qwebirc.ui.RootUI = qwebirc.ui.QuakeNetUI; + +qwebirc.ui.RequestTransformHTML = function(options) { + var HREF_ELEMENTS = { + "IMG": 1 + }; + + var update = options.update; + var onSuccess = options.onSuccess; + + var fixUp = function(node) { + if(node.nodeType != 1) + return; + + var tagName = node.nodeName.toUpperCase(); + if(HREF_ELEMENTS[tagName]) { + var attr = node.getAttribute("transform_attr"); + var value = node.getAttribute("transform_value"); + if($defined(attr) && $defined(value)) { + node.removeAttribute("transform_attr"); + node.removeAttribute("transform_value"); + node.setAttribute(attr, qwebirc.global.staticBaseURL + value); + } + } + + for(var i=0;i 0) { + var x = container.firstChild; + container.removeChild(x); + update.appendChild(x); + } + onSuccess(); + }; + + return new Request.HTML(options); +}; +