aboutsummaryrefslogtreecommitdiffstats
path: root/lib/assets/javascripts/cable
diff options
context:
space:
mode:
authorJavan Makhmali <javan@javan.us>2015-07-06 21:43:50 -0400
committerJavan Makhmali <javan@javan.us>2015-07-06 21:43:50 -0400
commit5da432c45b7b5ea5f99296ab83fb42f1a580600d (patch)
tree8f55d5d4977518af024caa436dd60066cb4a508a /lib/assets/javascripts/cable
parentf2542cd417e8ef753988c073a90a46bade5ef455 (diff)
downloadrails-5da432c45b7b5ea5f99296ab83fb42f1a580600d.tar.gz
rails-5da432c45b7b5ea5f99296ab83fb42f1a580600d.tar.bz2
rails-5da432c45b7b5ea5f99296ab83fb42f1a580600d.zip
websocket -> webSocket
Diffstat (limited to 'lib/assets/javascripts/cable')
-rw-r--r--lib/assets/javascripts/cable/connection.js.coffee26
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/assets/javascripts/cable/connection.js.coffee b/lib/assets/javascripts/cable/connection.js.coffee
index 530a589e87..bb3bc5dd12 100644
--- a/lib/assets/javascripts/cable/connection.js.coffee
+++ b/lib/assets/javascripts/cable/connection.js.coffee
@@ -4,28 +4,28 @@ class Cable.Connection
send: (data) ->
if @isOpen()
- @websocket.send(JSON.stringify(data))
+ @webSocket.send(JSON.stringify(data))
true
else
false
open: =>
return if @isState("open", "connecting")
- @websocket = new WebSocket(@consumer.url)
- @websocket.onmessage = @onMessage
- @websocket.onopen = @onOpen
- @websocket.onclose = @onClose
- @websocket.onerror = @onError
+ @webSocket = new WebSocket(@consumer.url)
+ @webSocket.onmessage = @onMessage
+ @webSocket.onopen = @onOpen
+ @webSocket.onclose = @onClose
+ @webSocket.onerror = @onError
close: ->
return if @isState("closed", "closing")
- @websocket?.close()
+ @webSocket?.close()
reopen: ->
if @isOpen()
- @websocket.onclose = @open
- @websocket.onerror = @open
- @websocket.close()
+ @webSocket.onclose = @open
+ @webSocket.onerror = @open
+ @webSocket.close()
else
@open()
@@ -36,7 +36,7 @@ class Cable.Connection
@getState() in states
getState: ->
- return state.toLowerCase() for state, value of WebSocket when value is @websocket?.readyState
+ return state.toLowerCase() for state, value of WebSocket when value is @webSocket?.readyState
null
onMessage: (message) =>
@@ -51,8 +51,8 @@ class Cable.Connection
onError: =>
@disconnect()
- @websocket.onclose = -> # no-op
- @websocket.onerror = -> # no-op
+ @webSocket.onclose = -> # no-op
+ @webSocket.onerror = -> # no-op
try @close()
disconnect: ->