Fix channels in topics, and url's ending with ].

diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
index 1c339cfb37ec22350e69b5108b0dc8563fadc955..b7b7683a049285110e1d7043d2eccfb1366bacc7 100644 (file)
--- a/js/ui/baseuiwindow.js
+++ b/js/ui/baseuiwindow.js
@@ -15,7 +15,8 @@ qwebirc.ui.Window = new Class({
   },
   updateNickList: function(nicks) {
   },
-  updateTopic: function(topic)  {
+  updateTopic: function(topic, element)  {
+    qwebirc.ui.Colourise("[" + topic + "]", element, this.client.exec, this.parentObject.urlDispatcher.bind(this.parentObject));
   },
   close: function() {
     if($defined(this.scrolltimer)) {

diff --git a/js/ui/qui.js b/js/ui/qui.js
index de0cbc278092e8056c2c5fef315a6cedb19b1096..21272b4781b04557b4d3f8a1c2c51b1e12c532c6 100644 (file)
--- a/js/ui/qui.js
+++ b/js/ui/qui.js
@@ -268,15 +268,13 @@ qwebirc.ui.QUI.Window = new Class({
     });
   },
   updateTopic: function(topic) {
-    this.parent(topic);
-    
     var t = this.topic;
     
     while(t.firstChild)
       t.removeChild(t.firstChild);
 
     if(topic) {
-      qwebirc.ui.Colourise("[" + topic + "]", t);
+      this.parent(topic, t);
     } else {
       var e = new Element("div");
       e.set("text", "(no topic set)");

diff --git a/js/ui/url.js b/js/ui/url.js
index f4cf2a640cf4865222f7ccf3c791ff4890107112..e58cc34383a86da77e8722d9dab86467261eb9c7 100644 (file)
--- a/js/ui/url.js
+++ b/js/ui/url.js
@@ -1,5 +1,5 @@
 qwebirc.ui.urlificate = function(element, text, execfn, cmdfn) {
-  var punct_re = /(\.*|\,|;)$/;
+  var punct_re = /(\.*|\,|;|\])$/;
 
   var txtprocess = function(text, regex, appendfn, matchfn) {
     for(;;) {