Merge pull request thedjpetersen#132 from ericbarch/master

Separation of IRC and websocket code. Created IRC connection class.

assets/css/subway.css

@@ -405,6 +405,7 @@ html { overflow: hidden; }
 .userlist_user {
   border-bottom: 1px solid #CCCCCC;
   display: table;
+  height: 31px;
   width: 100%;
 }
 

assets/js/client.js

@@ -109,7 +109,6 @@ $(function() {
   });
 
   irc.socket.on('notice', function(data) {
-    //TODO: make this work
     var window = irc.chatWindows.getByName('status');
     if(window === undefined){
       irc.connected = true;
@@ -230,7 +229,14 @@ $(function() {
   });
 
   irc.socket.on('error', function(data) {
-    console.log(data.message);
+    var window = irc.chatWindows.getByName('status');
+    if(window === undefined){
+      irc.connected = true;
+      irc.appView.render();
+      irc.chatWindows.add({name: 'status', type: 'status'});
+      window = irc.chatWindows.getByName('status');
+    }
+    window.stream.add({sender: 'error', raw: data.text, type: 'notice'});
   });
 
   irc.socket.on('netError', function(data) {

assets/js/views/overview.js

@@ -52,6 +52,7 @@ var OverviewView = Backbone.View.extend({
     var port = $('#connect-port').val();
     var secure = $('#connect-secure').is(':checked');
     var selfSigned = $('#connect-selfSigned').is(':checked');
+    var rejoin = $('#connect-rejoin').is(':checked');
     var password = $('#connect-password').val();
 
     if (!server) {
@@ -74,6 +75,7 @@ var OverviewView = Backbone.View.extend({
 	port: port,
         secure: secure,
         selfSigned: selfSigned,
+        rejoin: rejoin,
         password: password
       };