Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use queue if App.Ajax now.

Browse source
This commit is contained in:
Martin Edenhofer 2013-08-08 14:20:40 +02:00
parent cb77e7999f
commit f48fadd56b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/lib/app_post/websocket.js.coffee
View file

@ -287,11 +287,9 @@ class _webSocketSingleton extends App.Controller
# return if init is already done and not forced # return if init is already done and not forced
return if @_ajaxInitDone && !data.force return if @_ajaxInitDone && !data.force
# stop init request if new one is started
if @_ajaxInitWorking
@_ajaxInitWorking.abort()
# call init request # call init request
@_ajaxInitWorking = App.Ajax.request( App.Ajax.request(
id: 'ws-login'
type: 'POST' type: 'POST'
url: @Config.get('api_path') + '/message_send' url: @Config.get('api_path') + '/message_send'
data: JSON.stringify({ data: { action: 'login' } }) data: JSON.stringify({ data: { action: 'login' } })
@ -304,10 +302,8 @@ class _webSocketSingleton extends App.Controller
@_ajaxReceive() @_ajaxReceive()
@_ajaxSendQueue() @_ajaxSendQueue()
@_ajaxInitDone = true @_ajaxInitDone = true
@_ajaxInitWorking = false
error: => error: =>
@_ajaxInitDone = true @_ajaxInitDone = true
@_ajaxInitWorking = false
# try reconnect on error after x sec. # try reconnect on error after x sec.
reconnect = => reconnect = =>