Works on non-websocket environment refs #86

At non-websocket environment: - Don't raise exception, when message is post - Use a form POST to post message, instead of Ajax
codefirst · May 28, 2013 · 1f723ad · 1f723ad
1 parent f575d22
commit 1f723ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
@@ -40,6 +40,7 @@ $(function() {
     // ------------------------------
     // chat
     // ------------------------------
+    var connected = false;
     $(".message-list")
     .webSocket({
         pusher : AsakusaSatellite.pusher,
@@ -60,12 +61,15 @@ $(function() {
             }
         },
         'websocket::connect' : function(){
+            connected = true;
             $("img.websocket-status").attr('src', AsakusaSatellite.resouces.connect);
         },
         'websocket::error' : function(){
+            connected = false;
             $("img.websocket-status").attr('src', AsakusaSatellite.resouces.disconnect);
         },
         'websocket::disconnect' : function(){
+            connected = false;
             $("img.websocket-status").attr('src', AsakusaSatellite.resouces.disconnect);
         }
     });
@@ -76,12 +80,14 @@ $(function() {
     $('textarea#message').multiline();
 
     $('form.inputarea').bind('submit', function(e){
-        e.preventDefault();
-        jQuery.post(AsakusaSatellite.url.create, {
-            'room_id' : AsakusaSatellite.current.room,
-            'message' : $('textarea#message').val()
-        });
-        $('textarea#message').val('');
+      if(connected) {
+          e.preventDefault();
+          jQuery.post(AsakusaSatellite.url.create, {
+              'room_id' : AsakusaSatellite.current.room,
+              'message' : $('textarea#message').val()
+          });
+          $('textarea#message').val('');
+      }
     });
 
     // ------------------------------

diff --git a/app/helpers/chat_helper.rb b/app/helpers/chat_helper.rb
@@ -70,9 +70,14 @@ def publish_message(event, message, room)
            else
              { :content => to_json(message, room) }
            end
-    AsakusaSatellite::MessagePusher.trigger("as-#{room.id}",
-                                            "message_#{event}",
-                                            data.to_json)
+
+    begin
+      AsakusaSatellite::MessagePusher.trigger("as-#{room.id}",
+                                              "message_#{event}",
+                                                data.to_json)
+    rescue => e
+      Rails.logger.warn "fali to send message: #{e.inspect}"
+    end
 
     if event == :create then
       call_hook(:after_create_message, :message => message, :room => room)