Split window class into indepdent file, rename baseirc.js to baseircclient.js

diff --git a/compile.bat b/compile.bat
index 936a0ec112415a4bd82cfaa4900371ea501a9d4e..a66e1a2165167f5137934fb0fb5b9dfc54ba7fce 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\baseui.js + ui\colour.js + ui\theme.js + qwebircinterface.js ..\compiled\qwebirc-concat.js /b\r
+copy 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\theme.js + qwebircinterface.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/compile.sh b/compile.sh
index 3d4038735876ef4732159455afb34e3e671afcc4..16ead5739791549797341c0c2813ddb8f53c5e1b 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -3,7 +3,7 @@ mkdir -p compiled
 rm -f compiled/*.js
 
 cd js
-cat 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 qwebircinterface.js > ../compiled/qwebirc-concat.js
+cat 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/theme.js qwebircinterface.js > ../compiled/qwebirc-concat.js
 cat ui/swmlayout.js ui/swmui.js > ../compiled/swmui-concat.js
 cd ../compiled
 

diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index b1cc098a2eaa56d52294c15a5a4a063a1db7bf0a..299ad5e49fcd95dedc57a7ae26d3548ab647935f 100644 (file)
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -2,38 +2,6 @@ var WINDOW_STATUS = 1;
 var WINDOW_QUERY = 2;
 var WINDOW_CHANNEL = 3;
 
-var UIWindow = new Class({
-  Implements: [Events],
-  initialize: function(parentObject, client, type, name, identifier) {
-    this.parentObject = parentObject;
-    this.type = type;
-    this.name = name;
-    this.active = false;
-    this.client = client;
-    this.identifier = identifier;
-  },
-  updateNickList: function(nicks) {
-  },
-  updateTopic: function(topic)  {
-  },
-  close: function() {
-    this.parentObject.__closed(this);
-    this.fireEvent("close", this);
-  },
-  select: function() {
-    this.active = true;
-    this.parentObject.__setActiveWindow(this);
-  },
-  deselect: function() {
-    this.active = false;
-  },
-  addLine: function(type, line, colour) {
-  },
-  errorMessage: function(message) {
-    this.addLine("", message, "red");
-  }
-});
-
 var UI = new Class({
   initialize: function(parentElement, windowClass, uiName) {
     this.windows = {};

diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
new file mode 100644 (file)
index 0000000..fbac23a
--- /dev/null
+++ b/js/ui/baseuiwindow.js
@@ -0,0 +1,32 @@
+var UIWindow = new Class({
+  Implements: [Events],
+  initialize: function(parentObject, client, type, name, identifier) {
+    this.parentObject = parentObject;
+    this.type = type;
+    this.name = name;
+    this.active = false;
+    this.client = client;
+    this.identifier = identifier;
+  },
+  updateNickList: function(nicks) {
+  },
+  updateTopic: function(topic)  {
+  },
+  close: function() {
+    this.parentObject.__closed(this);
+    this.fireEvent("close", this);
+  },
+  select: function() {
+    this.active = true;
+    this.parentObject.__setActiveWindow(this);
+  },
+  deselect: function() {
+    this.active = false;
+  },
+  addLine: function(type, line, colour) {
+  },
+  errorMessage: function(message) {
+    this.addLine("", message, "red");
+  }
+});
+

diff --git a/static/swmuidebug.html b/static/swmuidebug.html
index 5e3f40b863e183fe1a881cf63e2f11468464c8c1..1735f3073ccd48c31c13ef0e1443c80a0952d0fb 100644 (file)
--- a/static/swmuidebug.html
+++ b/static/swmuidebug.html
@@ -10,11 +10,12 @@
   <script type="text/javascript" src="js/debug/jslib.js"></script>
   <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
   <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
+  <script type="text/javascript" src="js/debug/irc/baseircclient.js"></script>
   <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
   <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
   <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
   <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
+  <script type="text/javascript" src="js/debug/ui/baseuiwindow.js"></script>
   <script type="text/javascript" src="js/debug/ui/colour.js"></script>
   <script type="text/javascript" src="js/debug/ui/theme.js"></script>
   <script type="text/javascript" src="js/debug/ui/swmlayout.js"></script>

diff --git a/static/uglyuidebug.html b/static/uglyuidebug.html
index acf1f3e098fe0e86fce943e092dc8193f548dde3..2c6af6586f9c1f04861b86c5501e011449d8b0e2 100644 (file)
--- a/static/uglyuidebug.html
+++ b/static/uglyuidebug.html
@@ -10,11 +10,12 @@
   <script type="text/javascript" src="js/debug/jslib.js"></script>
   <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
   <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
+  <script type="text/javascript" src="js/debug/irc/baseircclient.js"></script>
   <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
   <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
   <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
   <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
+  <script type="text/javascript" src="js/debug/ui/baseuiwindow.js"></script>
   <script type="text/javascript" src="js/debug/ui/colour.js"></script>
   <script type="text/javascript" src="js/debug/ui/theme.js"></script>
   <script type="text/javascript" src="js/debug/ui/uglyui.js"></script>