From f1c93ed82802776c1be94fd8488257acaa253bd7 Mon Sep 17 00:00:00 2001
From: Javan Makhmali <javan@javan.us>
Date: Thu, 3 Mar 2016 21:40:16 -0500
Subject: Implicity add Subscription instance to subscriptions collection

---
 .../javascripts/action_cable/subscription.coffee   | 22 ++++++++++------------
 .../javascripts/action_cable/subscriptions.coffee  |  3 ++-
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'actioncable')

diff --git a/actioncable/app/assets/javascripts/action_cable/subscription.coffee b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
index 339d676933..61a3fb1309 100644
--- a/actioncable/app/assets/javascripts/action_cable/subscription.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscription.coffee
@@ -1,5 +1,5 @@
-# A new subscription is created through the ActionCable.Subscriptions instance available on the consumer. 
-# It provides a number of callbacks and a method for calling remote procedure calls on the corresponding 
+# A new subscription is created through the ActionCable.Subscriptions instance available on the consumer.
+# It provides a number of callbacks and a method for calling remote procedure calls on the corresponding
 # Channel instance on the server side.
 #
 # An example demonstrates the basic functionality:
@@ -7,13 +7,13 @@
 #   App.appearance = App.cable.subscriptions.create "AppearanceChannel",
 #     connected: ->
 #       # Called once the subscription has been successfully completed
-#   
+#
 #     appear: ->
 #       @perform 'appear', appearing_on: @appearingOn()
-#   
+#
 #     away: ->
 #       @perform 'away'
-#   
+#
 #     appearingOn: ->
 #       $('main').data 'appearing-on'
 #
@@ -27,15 +27,15 @@
 #     def subscribed
 #       current_user.appear
 #     end
-#   
+#
 #     def unsubscribed
 #       current_user.disappear
 #     end
-#   
+#
 #     def appear(data)
 #       current_user.appear on: data['appearing_on']
 #     end
-#   
+#
 #     def away
 #       current_user.away
 #     end
@@ -44,11 +44,9 @@
 # The "AppearanceChannel" name is automatically mapped between the client-side subscription creation and the server-side Ruby class name.
 # The AppearanceChannel#appear/away public methods are exposed automatically to client-side invocation through the @perform method.
 class ActionCable.Subscription
-  constructor: (@subscriptions, params = {}, mixin) ->
+  constructor: (@consumer, params = {}, mixin) ->
     @identifier = JSON.stringify(params)
     extend(this, mixin)
-    @subscriptions.add(this)
-    @consumer = @subscriptions.consumer
 
   # Perform a channel action with the optional data passed as an attribute
   perform: (action, data = {}) ->
@@ -59,7 +57,7 @@ class ActionCable.Subscription
     @consumer.send(command: "message", identifier: @identifier, data: JSON.stringify(data))
 
   unsubscribe: ->
-    @subscriptions.remove(this)
+    @consumer.subscriptions.remove(this)
 
   extend = (object, properties) ->
     if properties?
diff --git a/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
index 9d93b462a7..326e2ec20b 100644
--- a/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
@@ -13,7 +13,8 @@ class ActionCable.Subscriptions
   create: (channelName, mixin) ->
     channel = channelName
     params = if typeof channel is "object" then channel else {channel}
-    new ActionCable.Subscription this, params, mixin
+    subscription = new ActionCable.Subscription @consumer, params, mixin
+    @add(subscription)
 
   # Private
 
-- 
cgit v1.2.3