From 1fd6d145b4b9e3177ac4bec3c19d6a192fdd1c5d Mon Sep 17 00:00:00 2001
From: Junv <wahyd4@gmail.com>
Date: Thu, 6 Dec 2012 13:00:41 +0800
Subject: [PATCH] fix  pusher channel bug

---
 app/assets/javascripts/antechamber.js.coffee | 4 ++--
 app/controllers/antechamber_controller.rb    | 2 +-
 app/views/antechamber/index.html.slim        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/antechamber.js.coffee b/app/assets/javascripts/antechamber.js.coffee
index 0190e65..9b49946 100644
--- a/app/assets/javascripts/antechamber.js.coffee
+++ b/app/assets/javascripts/antechamber.js.coffee
@@ -10,6 +10,6 @@ $ ->
     $('.form-inline').ajaxSubmit options
 
   pusher = new Pusher $('#pusher_key').val()
-  channel = pusher.subscribe 'antechamber'
+  channel = pusher.subscribe $('#team_name').val()
   channel.bind 'new_message', (data) ->
-    $('.message-list').prepend(data.content)
+    $('.message-list').prepend(data.content).show('slow')
diff --git a/app/controllers/antechamber_controller.rb b/app/controllers/antechamber_controller.rb
index 7934fa1..41d3bcd 100644
--- a/app/controllers/antechamber_controller.rb
+++ b/app/controllers/antechamber_controller.rb
@@ -14,7 +14,7 @@ class AntechamberController < ApplicationController
     with_team do |team|
       message = Message.create team: team, person: current_person, content: params[:content]
 
-      Pusher.trigger('antechamber', 'new_message',{content:render_to_string( partial: 'shared/one_message', locals: {message: message})})
+      Pusher.trigger(team.name, 'new_message',{content:render_to_string( partial: 'shared/one_message', locals: {message: message})})
 
 	    render text:'ok'
     end
diff --git a/app/views/antechamber/index.html.slim b/app/views/antechamber/index.html.slim
index e64472b..65a49c7 100644
--- a/app/views/antechamber/index.html.slim
+++ b/app/views/antechamber/index.html.slim
@@ -8,6 +8,7 @@
 h1 = @team.name
 form.form-inline  action="/antechamber/#{@team.slug}"
   input type="hidden" id="pusher_key" value="#{ENV['PUSHER_KEY']}"
+  input type="hidden" id="team_name" value="#{@team.name}"
   p #{text_area_tag :content, nil, placeholder: 'Enter Message', rows: 4,class:'message-body'}
   a.btn.submit-mess  Send