From f37d88d84a566c0079bdb9074e32d20ec0f00429 Mon Sep 17 00:00:00 2001 From: Junv Date: Thu, 6 Dec 2012 09:30:36 +0800 Subject: [PATCH] ddd --- app/assets/javascripts/message.js | 7 +++++-- app/controllers/realtime_message_controller.rb | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/message.js b/app/assets/javascripts/message.js index 72c4486..a68f02b 100644 --- a/app/assets/javascripts/message.js +++ b/app/assets/javascripts/message.js @@ -7,10 +7,12 @@ */ $(document).ready(function(){ var address = window.location.host+'/websocket'; - var dispatcher = new WebSocketRails(address); + console.log('addr==============='+address) + var dispatcher = new WebSocketRails('localhost:3000/websocket'); dispatcher.on_open = function(data) { - console.log('Connection has been established: ' + data); + console.log('Connection has been established: '); + console.log(dispatcher) } $('.submit-mess').click(function(){ if ($('#content').val().replace(/\s+/, "") == ""){ @@ -29,5 +31,6 @@ $(document).ready(function(){ $('.message-list').prepend(content).show('slow'); }); + }); diff --git a/app/controllers/realtime_message_controller.rb b/app/controllers/realtime_message_controller.rb index 1d385ae..443c005 100644 --- a/app/controllers/realtime_message_controller.rb +++ b/app/controllers/realtime_message_controller.rb @@ -1,4 +1,6 @@ require 'team_filter' +require "socket" + class Realtime_message_controller < WebsocketRails::BaseController include TeamFilter @@ -8,7 +10,6 @@ class Realtime_message_controller < WebsocketRails::BaseController end def new_message - puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!I'm in here" with_team(message[:slug]) do @message = Message.create team: @team, person: current_person, content: message[:content]