X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/f54cfe1febcd4fe11ef7da13e068f5f14d5cbdfc..6d3d46b5084c75f074ce9e08ef248ff3586f7685:/js/ui/baseui.js diff --git a/js/ui/baseui.js b/js/ui/baseui.js index 93e371b..86145c9 100644 --- a/js/ui/baseui.js +++ b/js/ui/baseui.js @@ -6,15 +6,16 @@ qwebirc.ui.WINDOW_CONNECT = 0x10; qwebirc.ui.WINDOW_MESSAGES = 0x20; qwebirc.ui.CUSTOM_CLIENT = "custom"; +qwebirc.ui.DEFAULT_HUE = 210; /* nice blue */ qwebirc.ui.BaseUI = new Class({ Implements: [Events], initialize: function(parentElement, windowClass, uiName, options) { this.options = options; - this.windows = {}; - this.clients = {}; - this.windows[qwebirc.ui.CUSTOM_CLIENT] = {}; + this.windows = new QHash(); + this.clients = new QHash(); + this.windows.put(qwebirc.ui.CUSTOM_CLIENT, new QHash()); this.windowArray = []; this.windowClass = windowClass; this.parentElement = parentElement; @@ -47,19 +48,30 @@ 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++; + client.id = String(this.clientId++); client.hilightController = new qwebirc.ui.HilightController(client); - - this.windows[client.id] = {} - this.clients[client.id] = client; + client.addEvent("signedOn", function() { + this.poller = new qwebirc.xdomain.Poller(this.oobMessage.bind(this)); + this.fireEvent("signedOn", client); + }.bind(this)); + this.windows.put(client.id, new QHash()); + this.clients.put(client.id, client); var w = this.newWindow(client, qwebirc.ui.WINDOW_STATUS, "Status"); this.selectWindow(w); 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-2017 Chris Porter and the qwebirc project."); w.addLine("", "http://www.qwebirc.org"); w.addLine("", "Licensed under the GNU General Public License, Version 2."); } @@ -89,24 +101,25 @@ qwebirc.ui.BaseUI = new Class({ return w; var wId = this.getWindowIdentifier(client, type, name); - var w = this.windows[this.getClientId(client)][wId] = new this.windowClass(this, client, type, name, wId); + var w = new this.windowClass(this, client, type, name, wId); + this.windows.get(this.getClientId(client)).put(wId, w); this.windowArray.push(w); return w; }, getWindow: function(client, type, name) { - var c = this.windows[this.getClientId(client)]; + var c = this.windows.get(this.getClientId(client)); if(!$defined(c)) return null; - return c[this.getWindowIdentifier(client, type, name)]; + return c.get(this.getWindowIdentifier(client, type, name)); }, getActiveWindow: function() { return this.active; }, getActiveIRCWindow: function(client) { if(!this.active || this.active.type == qwebirc.ui.WINDOW_CUSTOM) { - return this.windows[this.getClientId(client)][this.getWindowIdentifier(client, qwebirc.ui.WINDOW_STATUS)]; + return this.windows.get(this.getClientId(client)).get(this.getWindowIdentifier(client, qwebirc.ui.WINDOW_STATUS)); } else { return this.active; } @@ -114,6 +127,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; + + this.windows.get(clientId).remove(window.identifier); + + var window = this.windowArray[index]; + window.name = name; + window.identifier = this.getWindowIdentifier(window.client, window.type, window.name); + + this.windows.get(clientId).put(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(); @@ -164,7 +200,7 @@ qwebirc.ui.BaseUI = new Class({ } this.windowArray = this.windowArray.erase(window); - delete this.windows[this.getClientId(window.client)][window.identifier]; + this.windows.get(this.getClientId(window.client)).remove(window.identifier); }, /* this shouldn't be called by overriding classes! @@ -174,12 +210,40 @@ qwebirc.ui.BaseUI = new Class({ tricked into getting themselves glined */ loginBox: function(callback, initialNickname, initialChannels, autoConnect, autoNick) { - qwebirc.ui.GenericLoginBox(this.parentElement, callback, initialNickname, initialChannels, autoConnect, autoNick, this.options.networkName); + this.postInitialize(); + + this.addCustomWindow("Connect", qwebirc.ui.ConnectPane, "connectpane", { + initialNickname: initialNickname, initialChannels: initialChannels, autoConnect: autoConnect, callback: callback, autoNick: autoNick, + uiOptions: this.options + }, qwebirc.ui.WINDOW_CONNECT); }, focusChange: function(newValue) { var window_ = this.getActiveWindow(); if($defined(window_)) window_.focusChange(newValue); + }, + oobMessage: function(message) { + var c = message.splitMax(" ", 2); + if(c.length != 2) + return; + + var command = c[0]; + if(command != "CMD") + return; + + var d = c[1].splitMax(" ", 2); + if(d.length != 2) + return; + + var command = d[0]; + var args = d[1]; + if(command == "SAY") { + var w = this.getActiveIRCWindow(); + if($defined(w) && (w.type == qwebirc.ui.WINDOW_CHANNEL || w.type == qwebirc.ui.WINDOW_QUERY)) { + w.client.exec("/SAY " + args); + return; + } + } } }); @@ -189,32 +253,40 @@ qwebirc.ui.StandardUI = new Class({ initialize: function(parentElement, windowClass, uiName, options) { this.parent(parentElement, windowClass, uiName, options); + this.__styleValues = {hue: qwebirc.ui.DEFAULT_HUE, saturation: 0, lightness: 0, textHue: null, textSaturation: null, textLightness: null}; + if($defined(this.options.hue)) this.__styleValues.hue = this.options.hue; this.tabCompleter = new qwebirc.ui.TabCompleterFactory(this); - this.uiOptions = new qwebirc.ui.DefaultOptionsClass(this); - this.customWindows = {}; - - var ev; - if(Browser.Engine.trident) { - ev = "keydown"; + this.uiOptions = new qwebirc.ui.DefaultOptionsClass(this, options.uiOptionsArg); + this.customWindows = new QHash(); + + if($defined(this.options.saturation)) this.__styleValues.saturation = this.options.saturation; + if($defined(this.options.lightness)) this.__styleValues.lightness = this.options.lightness; + if($defined(this.options.tsaturation)) this.__styleValues.textSaturation = this.options.tsaturation; + if($defined(this.options.tlightness)) this.__styleValues.textLightness = this.options.tlightness; + + if($defined(this.options.hue)) { /* overridden in url */ + /* ugh... this will go away when we add proper options for hue/sat/light for text and background */ + this.uiOptions.setValueByPrefix("STYLE_HUE", this.__styleValues.hue); } else { - ev = "keypress"; + this.__styleValues.hue = this.uiOptions.STYLE_HUE; /* otherwise copy from serialised store */ } - document.addEvent(ev, this.__handleHotkey.bind(this)); + this.__styleValues.textHue = $defined(this.options.thue) ? this.options.thue : this.__styleValues.hue; + + document.addEvent("keydown", this.__handleHotkey.bind(this)); }, __handleHotkey: function(x) { - if(!x.alt || x.control) { - if(x.key == "backspace" || x.key == "/") - if(!this.getInputFocused(x)) - new Event(x).stop(); - return; - } var success = false; - if(x.key == "a" || x.key == "A") { + if(!x.alt && !x.control && !x.shift && !x.meta) { + if((x.key == "backspace" || x.key == "/") && !this.getInputFocused(x)) { + success = true; + } + } else if(!x.alt || x.control || x.meta) { + /* do nothing */ + } else if(x.key == "a" || x.key == "A") { var highestNum = 0; var highestIndex = -1; success = true; - - new Event(x).stop(); + for(var i=0;i highestNum) { @@ -224,7 +296,7 @@ qwebirc.ui.StandardUI = new Class({ } if(highestIndex > -1) this.selectWindow(this.windowArray[highestIndex]); - } else if(x.key >= '0' && x.key <= '9') { + } else if((x.key >= '0' && x.key <= '9') && !x.shift) { success = true; number = x.key - '0'; @@ -237,15 +309,18 @@ qwebirc.ui.StandardUI = new Class({ return; this.selectWindow(this.windowArray[number]); - } else if(x.key == "left") { + } else if((x.key == "left" || x.key == "up") && !x.shift) { this.prevWindow(); success = true; - } else if(x.key == "right") { + } else if((x.key == "right" || x.key == "down") && !x.shift) { this.nextWindow(); success = true; } - if(success) + + if(success) { new Event(x).stop(); + x.preventDefault(); + } }, getInputFocused: function(x) { if($$("input").indexOf(x.target) == -1 && $$("textarea").indexOf(x.target) == -1) @@ -255,10 +330,10 @@ qwebirc.ui.StandardUI = new Class({ newCustomWindow: function(name, select, type) { if(!type) type = qwebirc.ui.WINDOW_CUSTOM; - + var w = this.newWindow(qwebirc.ui.CUSTOM_CLIENT, type, name); w.addEvent("close", function(w) { - delete this.windows[qwebirc.ui.CUSTOM_CLIENT][w.identifier]; + this.windows.get(qwebirc.ui.CUSTOM_CLIENT).remove(w.identifier); }.bind(this)); if(select) @@ -266,20 +341,20 @@ qwebirc.ui.StandardUI = new Class({ return w; }, - addCustomWindow: function(windowName, class_, cssClass, options) { + addCustomWindow: function(windowName, class_, cssClass, options, type) { if(!$defined(options)) options = {}; - if(this.customWindows[windowName]) { - this.selectWindow(this.customWindows[windowName]); + if(this.customWindows.contains(windowName)) { + this.selectWindow(this.customWindows.get(windowName)); return; } - var d = this.newCustomWindow(windowName, true); - this.customWindows[windowName] = d; + var d = this.newCustomWindow(windowName, true, type); + this.customWindows.put(windowName, d); d.addEvent("close", function() { - this.customWindows[windowName] = null; + this.customWindows.remove(windowName); }.bind(this)); if(cssClass) @@ -293,7 +368,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); @@ -307,8 +384,8 @@ qwebirc.ui.StandardUI = new Class({ feedbackWindow: function() { this.addCustomWindow("Feedback", qwebirc.ui.FeedbackPane, "feedbackpane", this.uiOptions); }, - faqWindow: function() { - this.addCustomWindow("FAQ", qwebirc.ui.FAQPane, "faqpane", this.uiOptions); + helpWindow: function() { + this.addCustomWindow("Help!", qwebirc.ui.HelpPane, "helppane", this.uiOptions); }, urlDispatcher: function(name, window) { if(name == "embedded") @@ -320,33 +397,59 @@ 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; }, - tabComplete: function(element) { - this.tabCompleter.tabComplete(element); + tabComplete: function(element, backwards) { + this.tabCompleter.tabComplete(element, backwards); }, resetTabComplete: function() { 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/" + (QWEBIRC_DEBUG ? "debug/" : "") + name + qwebirc.FILE_SUFFIX + ".mcss"); + this.setModifiableStylesheetValues({}); }, - setModifiableStylesheetValues: function(hue, saturation, lightness) { - if(!$defined(this.__styleSheet)) + 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; + if (!$defined(this.__styleValues.textHue) && !$defined(this.__styleValues.textLightness) && !$defined(this.__styleValues.textSaturation)) { + front = back; + } else { + front = {hue: Number(this.__styleValues.textHue), lightness: Number(this.__styleValues.textLightness), saturation: Number(this.__styleValues.textSaturation)} + } + 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)); } }); @@ -357,16 +460,25 @@ qwebirc.ui.NotificationUI = new Class({ this.__beeper = new qwebirc.ui.Beeper(this.uiOptions); this.__flasher = new qwebirc.ui.Flasher(this.uiOptions); - - this.beep = this.__beeper.beep.bind(this.__beeper); - - this.flash = this.__flasher.flash.bind(this.__flasher); + this.__notifier = new qwebirc.ui.Notifier(this.uiOptions); + this.cancelFlash = this.__flasher.cancelFlash.bind(this.__flasher); }, + beep: function() { + this.__beeper.beep(); + }, + notify: function(title, message, callback) { + this.__beeper.beep(); + this.__flasher.flash(); + this.__notifier.notify(title, message, callback); + }, setBeepOnMention: function(value) { if(value) this.__beeper.soundInit(); }, + setNotifications: function(value) { + this.__notifier.setEnabled(value); + }, updateTitle: function(text) { if(this.__flasher.updateTitle(text)) this.parent(text); @@ -374,30 +486,17 @@ qwebirc.ui.NotificationUI = new Class({ focusChange: function(value) { this.parent(value); this.__flasher.focusChange(value); - } -}); - -qwebirc.ui.NewLoginUI = new Class({ - Extends: qwebirc.ui.NotificationUI, - loginBox: function(callbackfn, initialNickname, initialChannels, autoConnect, autoNick) { - this.postInitialize(); - - var w = this.newCustomWindow("Connect", true, qwebirc.ui.WINDOW_CONNECT); - var callback = function(args) { - w.close(); - callbackfn(args); - }; - - qwebirc.ui.GenericLoginBox(w.lines, callback, initialNickname, initialChannels, autoConnect, autoNick, this.options.networkName); + this.__notifier.focusChange(value); } }); qwebirc.ui.QuakeNetUI = new Class({ - Extends: qwebirc.ui.NewLoginUI, + Extends: qwebirc.ui.NotificationUI, urlDispatcher: function(name, window) { if(name == "qwhois") { return ["span", function(auth) { - this.client.exec("/MSG Q whois #" + auth); + if($defined(this.parentObject.options.accountWhoisCommand)) + this.client.exec(this.parentObject.options.accountWhoisCommand + auth); }.bind(window)]; } return this.parent(name, window); @@ -406,15 +505,61 @@ qwebirc.ui.QuakeNetUI = new Class({ if(!qwebirc.auth.loggedin()) return; if(confirm("Log out?")) { - for(var client in this.clients) { - this.clients[client].quit("Logged out"); - }; + this.clients.each(function(k, v) { + v.quit("Logged out"); + }, this); /* 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); +}; +