Move addMessage code into ChatView.

assets/css/subway.css

@@ -175,7 +175,7 @@
   width: 100%;
 }
 
-.message_me{
+.message-me {
   background: #F9F9F9;
 }
 

assets/js/collections.js

@@ -2,10 +2,6 @@
 var Stream = Backbone.Collection.extend({
   model: Message,
 
-  initialize: function() {
-    this.bind('add', irc.appView.addMessage);
-  },
-
   unread: function() {
     return this.filter(function(msg) { return msg.get('unread'); });
   },

assets/js/views/channel_list.js

@@ -8,7 +8,7 @@ var ChannelListView = Backbone.View.extend({
 
   addChannel: function(chat) {
     console.log('channel added to list');
-    var view = new ChannelTabView({model: chat})
+    var view = new ChannelTabView({model: chat});
     $(this.el).append(view.render().el);
     irc.chatWindows.setActive(chat);
     view.setActive();

assets/js/views/chat.js

@@ -5,6 +5,7 @@ var ChatView = Backbone.View.extend({
     this.el = ich.chat();
     this.render();
     this.model.bind('change:topic', this.updateTitle, this);
+    this.model.stream.bind('add', this.addMessage, this);
   },
 
   updateTitle: function(channel) {
@@ -82,5 +83,25 @@ var ChatView = Backbone.View.extend({
         }
       }
     });
-  }
+  },
+
+  addMessage: function(msg) {
+    var view = new MessageView({model: msg});
+    $('#chat-contents').append(view.el);
+
+    if (msg.get('sender') === irc.me.nick) {
+      $(view.el).addClass('message-me');
+    }
+
+    // Scroll down to show new message
+    var chatWindowHeight = ($('#chat-contents')[0].scrollHeight - 555);
+    // If the window is large enough to be scrollable
+    if (chatWindowHeight > 0) {
+      // If the user isn't scrolling go to the bottom message
+      if ((chatWindowHeight - $('#chat-contents').scrollTop()) < 200) {
+        $('#chat-contents').scrollTo(view.el, 500);
+      }
+    }
+  },
+
 });

assets/js/views/chat_application.js

@@ -16,26 +16,6 @@ var ChatApplicationView = Backbone.View.extend({
     return this;
   },
 
-  addMessage: function(msg) {
-    var view = new MessageView({model: msg});
-    var targetDiv = this.channel.view.$('#chat-contents');
-    targetDiv.append(view.el);
-
-    if (msg.get('sender') === irc.me.nick) {
-      $(view.el).addClass('message_me');
-    }
-
-    console.log('message added!');
-    var chatWindowHeight = (targetDiv.get(0).scrollHeight-555);
-    // If the window is large enough to be scrollable
-    if(chatWindowHeight > 0) {
-      // If the user isn't scrolling go to the bottom message
-      if ((chatWindowHeight - targetDiv.scrollTop()) < 200) {
-        targetDiv.scrollTo(view.el, 500);
-      }
-    }
-  },
-
   focus: function(chat) {
     if (!chat.get('active')) {
       return;