Fix a bug in swmui.

diff --git a/compile.bat b/compile.bat
index f42bb6fecdb445f66a3c7e7ac68ebbe9516bcb60..19660bf58b2091abb80d8959b95220cbf5c0e5d2 100644 (file)
--- a/compile.bat
+++ b/compile.bat
@@ -3,7 +3,7 @@ mkdir compiled
 del /q compiled\*.js\r
 \r
 cd js\r
-copy version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseirc.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\uibase.js + ui\colour.js + ui\theme.js ..\compiled\qwebirc-concat.js /b\r
+copy version.js + jslib.js + irc\ircconnection.js + irc\irclib.js + irc\baseirc.js + irc\irctracker.js + irc\commandparser.js + irc\ircclient.js + ui\baseui.js + ui\colour.js + ui\theme.js ..\compiled\qwebirc-concat.js /b\r
 copy ui\swmlayout.js + ui\swmui.js ..\compiled\swmui-concat.js /b\r
 cd ..\compiled\r
 \r

diff --git a/js/irc/baseirc.js b/js/irc/baseirc.js
index 02af0f75c3a1610bbb67246175ec7d33be7eab8c..29184eddd8bf1668cb35d93435b6d460e5624be5 100644 (file)
--- a/js/irc/baseirc.js
+++ b/js/irc/baseirc.js
@@ -134,10 +134,10 @@ var BaseIRCClient = new Class({
     var channel = params[0];\r
     var user = prefix;\r
     var nick = user.hostToNick();\r
-    \r
+        \r
     if(nick == this.nickname)\r
       this.channels[channel] = true;\r
-      \r
+    \r
     this.userJoined(user, channel);\r
     \r
     return true;\r

diff --git a/js/ui/swmui.js b/js/ui/swmui.js
index 285547c421365582cc5d57c0c269ad1283d70592..e29d975f7401f7fadbd3ff7acb3826170e1d2728 100644 (file)
--- a/js/ui/swmui.js
+++ b/js/ui/swmui.js
@@ -62,18 +62,18 @@ var SWMUIWindow = new Class({
       e.appendChild(document.createTextNode(nick));\r
     });\r
     \r
-    parentObject.resize();\r
+    this.parentObject.resize();\r
   },\r
   updateTopic: function(topic) {\r
     this.parent(topic);\r
-\r
     var t = this.topic.element;\r
     \r
     while(t.firstChild)\r
       t.removeChild(t.firstChild);\r
 \r
-    this.parentObject.resize();\r
     Colourise(topic, t);\r
+\r
+    this.parentObject.resize();\r
   },\r
   select: function() {\r
     this.parent();\r

diff --git a/static/css/swmui.css b/static/css/swmui.css
index 95e96b5a730f989ede03526f1a6fae5f18a8567f..9f383c23fa6d34cfa5bb39dfec29a96aa16cc821 100644 (file)
--- a/static/css/swmui.css
+++ b/static/css/swmui.css
@@ -67,7 +67,7 @@ body, html {
 }\r
 \r
 .qwebirc-swmui .tab-selected {\r
-  background: #eff;\r
+  background: #fef;\r
 }\r
 \r
 .qwebirc-swmui .tab-unselected {\r