Fix topic bug.

Fix compilation, YUI doesn't like files without newlines at the end.

diff --git a/TODO.txt b/TODO.txt
index 06231d48f4f539cb2fef940ab59c62c93cd926ab..5659c8eaed0d08958ed0f89dba3edacfc4f95eff 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,2 +1 @@
 make pretty again.\r
-swmui window bug\r

diff --git a/compile.bat b/compile.bat
index 710a63d75de73b210d87d826fe6d5201232c9e27..d65c991559c62fd752a85eac5ab7d760aa52fad1 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -3,7 +3,7 @@ mkdir compiled
 del /q compiled\*.js\r
 \r
 cd js\r
-copy qwebirc.js version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseircclient.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\baseui.js + ui\baseuiwindow.js + ui\colour.js + ui\url.js + ui\theme.js + ui\genericlogin.js + ui\embedwizard.js + qwebircinterface.js + irc\commandhistory.js ..\compiled\qwebirc-concat.js /b\r
+copy qwebirc.js + version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseircclient.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\baseui.js + ui\baseuiwindow.js + ui\colour.js + ui\url.js + ui\theme.js + ui\genericlogin.js + ui\embedwizard.js + qwebircinterface.js + irc\commandhistory.js ..\compiled\qwebirc-concat.js /b\r
 copy ui\swmui.js + ui\swmlayout.js ..\compiled\swmui-concat.js /b\r
 cd ..\compiled\r
 \r

diff --git a/js/irc/baseircclient.js b/js/irc/baseircclient.js
index 165edd934249d0031dd8773e3cd5bae07d6417f0..f8b0e072a726dd3944cd9a143ee3bd226b5896a8 100644 (file)
--- a/js/irc/baseircclient.js
+++ b/js/irc/baseircclient.js
@@ -302,7 +302,12 @@ qwebirc.irc.BaseIRCClient = new Class({
     return true;
   },
   irc_RPL_NOTOPIC: function(prefix, params) {
-    return true;
+    var channel = params[1];
+
+    if(this.channels[channel]) {
+      this.initialTopic(channel, "");
+      return true;
+    }
   },  
   irc_RPL_TOPIC: function(prefix, params) {
     var channel = params[1];

diff --git a/js/irc/ircconnection.js b/js/irc/ircconnection.js
index d7632030d8a31fec427c08022c0948ad86fc8b3c..50216255c131f93d5a8c694787ad076a6aab37fd 100644 (file)
--- a/js/irc/ircconnection.js
+++ b/js/irc/ircconnection.js
@@ -43,7 +43,6 @@ qwebirc.irc.IRCConnection = new Class({
     if(this.lastactiverequest) {
       this.lastactiverequest.cancel();
       this.lastactiverequest = null;
-      alert("warning: last active request");
     }
     if(this.activerequest) {
       this.lastactiverequest = this.activerequest;
@@ -111,7 +110,7 @@ qwebirc.irc.IRCConnection = new Class({
     var r = new Request.JSON({url: "/e/n?nick=" + encodeURIComponent(this.initialNickname) + "&r=" + Math.random() * 1024 * 1024, onComplete: function(o) {
       if(!o) {
         this.disconnected = true;
-        alert("Couldn't connect to remote server.");
+        this.__error("Couldn't connect to remote server.");
         return;
       }
       if(o[0] == false) {

diff --git a/js/irc/irclib.js b/js/irc/irclib.js
index a83850a08b6359310cd6e4ee4b79855b5190ec73..1bd3db08ad70cdef39c903651ef626e26df3723e 100644 (file)
--- a/js/irc/irclib.js
+++ b/js/irc/irclib.js
@@ -67,4 +67,4 @@ qwebirc.irc.IRCTimestamp = function(d) {
 
 qwebirc.irc.IRCDate = function(d) {
   return qwebirc.util.DaysOfWeek[d.getDay()] + " " + qwebirc.util.MonthsOfYear[d.getMonth()] + " " + pad(d.getDate()) + " "  + pad(d.getHours()) + ":" + pad(d.getMinutes()) + ":" + pad(d.getSeconds()) + " " + d.getFullYear();
-}
\ No newline at end of file
+}

diff --git a/js/ui/genericlogin.js b/js/ui/genericlogin.js
index 1d7fba6e83403d6fb13e84ce1cb482a87417cf01..3ff9af8d2d73c0a1ada31042346f85e4b96433eb 100644 (file)
--- a/js/ui/genericlogin.js
+++ b/js/ui/genericlogin.js
@@ -144,4 +144,4 @@ qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initial
   chan.set("value", initialChannels);
 
   nick.focus();
-}
\ No newline at end of file
+}

diff --git a/js/ui/mochaui.js b/js/ui/mochaui.js
index 9c1e86a3843fdbbd64e69e894385845525ac6f0f..8eb1b583b503e7e6fd9be3b956f7f9814bc039d6 100644 (file)
--- a/js/ui/mochaui.js
+++ b/js/ui/mochaui.js
@@ -189,7 +189,7 @@ qwebirc.ui.MochaUI.Window = new Class({
     while(t.firstChild)
       t.removeChild(t.firstChild);
 
-    Colourise(topic, t);
+    qwebirc.ui.Colourise(topic, t);
   },
   addLine: function(type, line, colour) {
     var e = new Element("div");

diff --git a/js/ui/qui.js b/js/ui/qui.js
index 959b83694e7d295ae937921c3dc6fb5ef413e2ed..ef224d541a88d715c974551a0696d1676ade70d8 100644 (file)
--- a/js/ui/qui.js
+++ b/js/ui/qui.js
@@ -276,7 +276,7 @@ qwebirc.ui.QUI.Window = new Class({
       t.removeChild(t.firstChild);
 
     if(topic) {
-      Colourise("[" + topic + "]", t);
+      qwebirc.ui.Colourise("[" + topic + "]", t);
     } else {
       var e = new Element("div");
       e.set("text", "(no topic set)");

diff --git a/js/ui/swmui.js b/js/ui/swmui.js
index 50957e303245ae089760d1d47c110b0195a8009e..8517a5c335407e150e3e672d33a735f7a69a9245 100644 (file)
--- a/js/ui/swmui.js
+++ b/js/ui/swmui.js
@@ -115,7 +115,7 @@ qwebirc.ui.SWMUI.Window = new Class({
     this.parent(topic);
 
     this.topic.removeAllChildren();
-    Colourise(topic, this.topic.element);
+    qwebirc.ui.Colourise(topic, this.topic.element);
 
     this.parentObject.resize();
   },

diff --git a/js/ui/uglyui.js b/js/ui/uglyui.js
index d9ce39bb28a4560af7a3e439182091c0d219d4f1..14d8df400c87837b263968a3336db451756edb9a 100644 (file)
--- a/js/ui/uglyui.js
+++ b/js/ui/uglyui.js
@@ -116,7 +116,7 @@ qwebirc.ui.UglyUI.Window = new Class({
     while(t.firstChild)
       t.removeChild(t.firstChild);
 
-    Colourise(topic, t);
+    qwebirc.ui.Colourise(topic, t);
   },
   select: function() {
     this.parent();