Skip to content

Commit 2177168

Browse files
committed
Merge pull request websocket-rails#171 from lkol/master
Added a possibility to set channel success and failure callbacks on subs...
2 parents 35b2ce1 + 9f48654 commit 2177168

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/assets/javascripts/websocket_rails/channel.js.coffee

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ For instance:
99
###
1010
class WebSocketRails.Channel
1111

12-
constructor: (@name, @_dispatcher, @is_private) ->
12+
constructor: (@name, @_dispatcher, @is_private, @on_success, @on_failure) ->
1313
if @is_private
1414
event_name = 'websocket_rails.subscribe_private'
1515
else
@@ -55,9 +55,9 @@ class WebSocketRails.Channel
5555
callback message
5656

5757
# using this method because @on_success will not be defined when the constructor is executed
58-
_success_launcher: (data) ->
58+
_success_launcher: (data) =>
5959
@on_success(data) if @on_success?
6060

6161
# using this method because @on_failure will not be defined when the constructor is executed
62-
_failure_launcher: (data) ->
62+
_failure_launcher: (data) =>
6363
@on_failure(data) if @on_failure?

lib/assets/javascripts/websocket_rails/websocket_rails.js.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ class @WebSocketRails
102102
for callback in @callbacks[event.name]
103103
callback event.data
104104

105-
subscribe: (channel_name) =>
105+
subscribe: (channel_name, success_callback, failure_callback) =>
106106
unless @channels[channel_name]?
107-
channel = new WebSocketRails.Channel channel_name, @
107+
channel = new WebSocketRails.Channel channel_name, @, false, success_callback, failure_callback
108108
@channels[channel_name] = channel
109109
channel
110110
else
111111
@channels[channel_name]
112112

113-
subscribe_private: (channel_name) =>
113+
subscribe_private: (channel_name, success_callback, failure_callback) =>
114114
unless @channels[channel_name]?
115-
channel = new WebSocketRails.Channel channel_name, @, true
115+
channel = new WebSocketRails.Channel channel_name, @, true, success_callback, failure_callback
116116
@channels[channel_name] = channel
117117
channel
118118
else

0 commit comments

Comments
 (0)