aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/app
diff options
context:
space:
mode:
authorDaniel Rhodes <rhodes.daniel@gmail.com>2016-03-01 01:21:19 +0100
committerDaniel Rhodes <rhodes.daniel@gmail.com>2016-03-01 01:38:35 +0100
commitf51cb7eef5be8e3496ea653fec04bedd6e5ec334 (patch)
tree4f4e8da88b138334aaf7c8b4814a295c8575abbc /actioncable/app
parentaf2c427c390b87ea20986f1e82b498068800d775 (diff)
downloadrails-f51cb7eef5be8e3496ea653fec04bedd6e5ec334.tar.gz
rails-f51cb7eef5be8e3496ea653fec04bedd6e5ec334.tar.bz2
rails-f51cb7eef5be8e3496ea653fec04bedd6e5ec334.zip
Added welcome message type and fix test hacks
Diffstat (limited to 'actioncable/app')
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee
index 4244322a1e..8cab6a301f 100644
--- a/actioncable/app/assets/javascripts/action_cable/connection.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee
@@ -75,6 +75,8 @@ class ActionCable.Connection
{identifier, message, type} = JSON.parse(event.data)
switch type
+ when message_types.welcome
+ @consumer.subscriptions.notify(@consumer.connectionMonitor, "connected")
when message_types.confirmation
@consumer.subscriptions.notify(identifier, "connected")
when message_types.rejection