Fixed ajax name spacing issue. Added controller based .abort() on remove of controller from DOM (improved memory management).
This commit is contained in:
parent
eba699b5ac
commit
d4caa3fbfc
26 changed files with 93 additions and 55 deletions
|
@ -23,6 +23,12 @@ class App.Controller extends Spine.Controller
|
||||||
# create common accessors
|
# create common accessors
|
||||||
@apiPath = @Config.get('api_path')
|
@apiPath = @Config.get('api_path')
|
||||||
|
|
||||||
|
# remember ajax calls to abort them on dom release
|
||||||
|
@ajaxCalls = []
|
||||||
|
@ajax = (data) =>
|
||||||
|
ajaxId = App.Ajax.request(data)
|
||||||
|
@ajaxCalls.push ajaxId
|
||||||
|
|
||||||
bind: (event, callback) =>
|
bind: (event, callback) =>
|
||||||
App.Event.bind(
|
App.Event.bind(
|
||||||
event
|
event
|
||||||
|
@ -53,6 +59,9 @@ class App.Controller extends Spine.Controller
|
||||||
App.Event.unbindLevel(@controllerId)
|
App.Event.unbindLevel(@controllerId)
|
||||||
App.Delay.clearLevel(@controllerId)
|
App.Delay.clearLevel(@controllerId)
|
||||||
App.Interval.clearLevel(@controllerId)
|
App.Interval.clearLevel(@controllerId)
|
||||||
|
if @ajaxCalls
|
||||||
|
for callId in @ajaxCalls
|
||||||
|
App.Ajax.abort(callId)
|
||||||
|
|
||||||
release: =>
|
release: =>
|
||||||
# release custom bindings after it got removed from dom
|
# release custom bindings after it got removed from dom
|
||||||
|
@ -74,7 +83,6 @@ class App.Controller extends Spine.Controller
|
||||||
App.Interval.reset()
|
App.Interval.reset()
|
||||||
App.WebSocket.close( force: true )
|
App.WebSocket.close( force: true )
|
||||||
|
|
||||||
|
|
||||||
# add @notify methode to create notification
|
# add @notify methode to create notification
|
||||||
notify: (data) ->
|
notify: (data) ->
|
||||||
App.Event.trigger 'notify', data
|
App.Event.trigger 'notify', data
|
||||||
|
@ -376,7 +384,7 @@ class App.Controller extends Spine.Controller
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
tickets = {}
|
tickets = {}
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @Config.get('api_path') + '/ticket_customer',
|
url: @Config.get('api_path') + '/ticket_customer',
|
||||||
data: {
|
data: {
|
||||||
|
|
|
@ -20,7 +20,7 @@ class App.DashboardActivityStream extends App.Controller
|
||||||
|
|
||||||
# init fetch via ajax, all other updates on time via websockets
|
# init fetch via ajax, all other updates on time via websockets
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'dashoard_activity_stream'
|
id: 'dashoard_activity_stream'
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/activity_stream'
|
url: @apiPath + '/activity_stream'
|
||||||
|
|
|
@ -8,7 +8,7 @@ class App.DashboardRecentViewed extends App.Controller
|
||||||
@items = []
|
@items = []
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'dashboard_recent_viewed',
|
id: 'dashboard_recent_viewed',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/recent_viewed',
|
url: @apiPath + '/recent_viewed',
|
||||||
|
|
|
@ -18,7 +18,7 @@ class App.DashboardRss extends App.Controller
|
||||||
|
|
||||||
# init fetch via ajax, all other updates on time via websockets
|
# init fetch via ajax, all other updates on time via websockets
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'dashboard_rss'
|
id: 'dashboard_rss'
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/rss_fetch'
|
url: @apiPath + '/rss_fetch'
|
||||||
|
|
|
@ -27,7 +27,7 @@ class App.DashboardTicket extends App.Controller
|
||||||
|
|
||||||
# init fetch via ajax, all other updates on time via websockets
|
# init fetch via ajax, all other updates on time via websockets
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'dashboard_ticket_' + @key,
|
id: 'dashboard_ticket_' + @key,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_overviews',
|
url: @apiPath + '/ticket_overviews',
|
||||||
|
|
|
@ -34,7 +34,7 @@ class App.ProfileLanguage extends App.Controller
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
@locale = params['locale']
|
@locale = params['locale']
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'preferences'
|
id: 'preferences'
|
||||||
type: 'PUT'
|
type: 'PUT'
|
||||||
url: @apiPath + '/users/preferences'
|
url: @apiPath + '/users/preferences'
|
||||||
|
|
|
@ -50,7 +50,7 @@ class App.ProfileLinkedAccounts extends App.Controller
|
||||||
uid = $(e.target).data('uid')
|
uid = $(e.target).data('uid')
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'account'
|
id: 'account'
|
||||||
type: 'DELETE'
|
type: 'DELETE'
|
||||||
url: @apiPath + '/users/account'
|
url: @apiPath + '/users/account'
|
||||||
|
|
|
@ -35,7 +35,7 @@ class App.ProfilePassword extends App.Controller
|
||||||
@formDisable(e)
|
@formDisable(e)
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'password_reset'
|
id: 'password_reset'
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @apiPath + '/users/password_change'
|
url: @apiPath + '/users/password_change'
|
||||||
|
|
|
@ -102,7 +102,7 @@ class App.TicketCreate extends App.Controller
|
||||||
|
|
||||||
@render()
|
@render()
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_create'
|
id: 'ticket_create'
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/ticket_create'
|
url: @apiPath + '/ticket_create'
|
||||||
|
|
|
@ -10,7 +10,7 @@ class App.TicketHistory extends App.ControllerModal
|
||||||
|
|
||||||
fetch: (@ticket_id) ->
|
fetch: (@ticket_id) ->
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_history',
|
id: 'ticket_history',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_history/' + ticket_id,
|
url: @apiPath + '/ticket_history/' + ticket_id,
|
||||||
|
|
|
@ -6,7 +6,7 @@ class App.TicketMerge extends App.ControllerModal
|
||||||
fetch: ->
|
fetch: ->
|
||||||
|
|
||||||
# merge tickets
|
# merge tickets
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_merge_list',
|
id: 'ticket_merge_list',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_merge_list/' + @ticket_id,
|
url: @apiPath + '/ticket_merge_list/' + @ticket_id,
|
||||||
|
@ -104,7 +104,7 @@ class App.TicketMerge extends App.ControllerModal
|
||||||
params = @formParam(e.target)
|
params = @formParam(e.target)
|
||||||
|
|
||||||
# merge tickets
|
# merge tickets
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_merge',
|
id: 'ticket_merge',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_merge/' + @ticket_id + '/' + params['master_ticket_number'],
|
url: @apiPath + '/ticket_merge/' + @ticket_id + '/' + params['master_ticket_number'],
|
||||||
|
|
|
@ -34,7 +34,7 @@ class Index extends App.ControllerContent
|
||||||
|
|
||||||
@render()
|
@render()
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_create',
|
id: 'ticket_create',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_create',
|
url: @apiPath + '/ticket_create',
|
||||||
|
|
|
@ -18,7 +18,7 @@ class Index extends App.ControllerContent
|
||||||
fetch: ->
|
fetch: ->
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'getting_started',
|
id: 'getting_started',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/getting_started',
|
url: @apiPath + '/getting_started',
|
||||||
|
|
|
@ -11,7 +11,7 @@ class App.LinkInfo extends App.Controller
|
||||||
fetch: () =>
|
fetch: () =>
|
||||||
# fetch item on demand
|
# fetch item on demand
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'links_' + @object.id + '_' + @object_type,
|
id: 'links_' + @object.id + '_' + @object_type,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/links',
|
url: @apiPath + '/links',
|
||||||
|
@ -80,7 +80,7 @@ class App.LinkInfo extends App.Controller
|
||||||
link_object_target_value = @object.id
|
link_object_target_value = @object.id
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'links_remove_' + @object.id + '_' + @object_type,
|
id: 'links_remove_' + @object.id + '_' + @object_type,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/links/remove',
|
url: @apiPath + '/links/remove',
|
||||||
|
@ -123,7 +123,7 @@ class App.LinkAdd extends App.ControllerModal
|
||||||
params = @formParam(e.target)
|
params = @formParam(e.target)
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'links_add_' + @object.id + '_' + @object_type,
|
id: 'links_add_' + @object.id + '_' + @object_type,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/links/add',
|
url: @apiPath + '/links/add',
|
||||||
|
|
|
@ -83,8 +83,8 @@ class App.Navigation extends App.Controller
|
||||||
@searchFocusSet = false
|
@searchFocusSet = false
|
||||||
|
|
||||||
searchFunction = =>
|
searchFunction = =>
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'ticket_search'
|
id: 'search'
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/search'
|
url: @apiPath + '/search'
|
||||||
data:
|
data:
|
||||||
|
|
|
@ -13,7 +13,7 @@ class Index extends App.ControllerContent
|
||||||
@load()
|
@load()
|
||||||
|
|
||||||
load: ->
|
load: ->
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'packages',
|
id: 'packages',
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/packages',
|
url: @apiPath + '/packages',
|
||||||
|
@ -47,7 +47,7 @@ class Index extends App.ControllerContent
|
||||||
httpType = 'DELETE'
|
httpType = 'DELETE'
|
||||||
|
|
||||||
if httpType
|
if httpType
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'packages',
|
id: 'packages',
|
||||||
type: httpType,
|
type: httpType,
|
||||||
url: @apiPath + '/packages',
|
url: @apiPath + '/packages',
|
||||||
|
|
|
@ -43,7 +43,7 @@ class Index extends App.ControllerContent
|
||||||
@formDisable(e)
|
@formDisable(e)
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'password_reset'
|
id: 'password_reset'
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @apiPath + '/users/password_reset'
|
url: @apiPath + '/users/password_reset'
|
||||||
|
@ -83,7 +83,7 @@ class Verify extends App.ControllerContent
|
||||||
# get data
|
# get data
|
||||||
params = {}
|
params = {}
|
||||||
params['token'] = @token
|
params['token'] = @token
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'password_reset_verify'
|
id: 'password_reset_verify'
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @apiPath + '/users/password_reset_verify'
|
url: @apiPath + '/users/password_reset_verify'
|
||||||
|
@ -119,7 +119,7 @@ class Verify extends App.ControllerContent
|
||||||
@password = params['password']
|
@password = params['password']
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'password_reset_verify'
|
id: 'password_reset_verify'
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @apiPath + '/users/password_reset_verify'
|
url: @apiPath + '/users/password_reset_verify'
|
||||||
|
|
|
@ -11,12 +11,12 @@ class Session extends App.ControllerContent
|
||||||
@interval(
|
@interval(
|
||||||
=>
|
=>
|
||||||
@load()
|
@load()
|
||||||
10000
|
30000
|
||||||
)
|
)
|
||||||
|
|
||||||
# fetch data, render view
|
# fetch data, render view
|
||||||
load: ->
|
load: ->
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'sessions'
|
id: 'sessions'
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/sessions'
|
url: @apiPath + '/sessions'
|
||||||
|
@ -42,7 +42,7 @@ class Session extends App.ControllerContent
|
||||||
destroy: (e) ->
|
destroy: (e) ->
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
sessionId = $( e.target ).data('session-id')
|
sessionId = $( e.target ).data('session-id')
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'sessions/' + sessionId
|
id: 'sessions/' + sessionId
|
||||||
type: 'DELETE'
|
type: 'DELETE'
|
||||||
url: @apiPath + '/sessions/' + sessionId
|
url: @apiPath + '/sessions/' + sessionId
|
||||||
|
|
|
@ -9,7 +9,7 @@ class App.TagWidget extends App.Controller
|
||||||
|
|
||||||
load: =>
|
load: =>
|
||||||
@attribute_id = 'tags_' + @object.id + '_' + @object_type
|
@attribute_id = 'tags_' + @object.id + '_' + @object_type
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: @attribute_id
|
id: @attribute_id
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/tags'
|
url: @apiPath + '/tags'
|
||||||
|
@ -40,7 +40,7 @@ class App.TagWidget extends App.Controller
|
||||||
# @el.find('#tags').elastic()
|
# @el.find('#tags').elastic()
|
||||||
|
|
||||||
onAddTag: (item) =>
|
onAddTag: (item) =>
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/tags/add',
|
url: @apiPath + '/tags/add',
|
||||||
data:
|
data:
|
||||||
|
@ -53,7 +53,7 @@ class App.TagWidget extends App.Controller
|
||||||
)
|
)
|
||||||
|
|
||||||
onRemoveTag: (item) =>
|
onRemoveTag: (item) =>
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/tags/remove'
|
url: @apiPath + '/tags/remove'
|
||||||
data:
|
data:
|
||||||
|
|
|
@ -39,7 +39,7 @@ class Index extends App.ControllerContent
|
||||||
|
|
||||||
# init fetch via ajax, all other updates on time via websockets
|
# init fetch via ajax, all other updates on time via websockets
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_overview_' + @key,
|
id: 'ticket_overview_' + @key,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: @apiPath + '/ticket_overviews',
|
url: @apiPath + '/ticket_overviews',
|
||||||
|
@ -500,7 +500,7 @@ class Router extends App.Controller
|
||||||
@ticket_list = cache.ticket_list
|
@ticket_list = cache.ticket_list
|
||||||
@redirect()
|
@redirect()
|
||||||
else
|
else
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/ticket_overviews'
|
url: @apiPath + '/ticket_overviews'
|
||||||
data:
|
data:
|
||||||
|
|
|
@ -64,7 +64,7 @@ class App.TicketZoom extends App.Controller
|
||||||
return if !@Session.all()
|
return if !@Session.all()
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
App.Com.ajax(
|
@ajax(
|
||||||
id: 'ticket_zoom_' + ticket_id
|
id: 'ticket_zoom_' + ticket_id
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
url: @apiPath + '/ticket_full/' + ticket_id + '?do_not_log=' + @doNotLog
|
url: @apiPath + '/ticket_full/' + ticket_id + '?do_not_log=' + @doNotLog
|
||||||
|
|
|
@ -113,7 +113,7 @@ class _trackSingleton
|
||||||
catch e
|
catch e
|
||||||
# nothing
|
# nothing
|
||||||
|
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @url
|
url: @url
|
||||||
async: async
|
async: async
|
||||||
|
|
|
@ -1,9 +1,14 @@
|
||||||
class App.Com
|
class App.Ajax
|
||||||
_instance = undefined # Must be declared here to force the closure on the class
|
_instance = undefined # Must be declared here to force the closure on the class
|
||||||
@ajax: (args) -> # Must be a static method
|
@request: (args) -> # Must be a static method
|
||||||
if _instance == undefined
|
if _instance == undefined
|
||||||
_instance ?= new _ajaxSingleton
|
_instance ?= new _ajaxSingleton
|
||||||
_instance.ajax(args)
|
_instance.request(args)
|
||||||
|
|
||||||
|
@abort: (args) -> # Must be a static method
|
||||||
|
if _instance == undefined
|
||||||
|
_instance ?= new _ajaxSingleton
|
||||||
|
_instance.abort(args)
|
||||||
|
|
||||||
# The actual Singleton class
|
# The actual Singleton class
|
||||||
class _ajaxSingleton
|
class _ajaxSingleton
|
||||||
|
@ -61,19 +66,44 @@ class _ajaxSingleton
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
ajax: (params) ->
|
request: (params) ->
|
||||||
data = $.extend({}, @defaults, params )
|
data = $.extend({}, @defaults, params )
|
||||||
|
|
||||||
|
# execute call with id, clear old call first if exists
|
||||||
if params['id']
|
if params['id']
|
||||||
if @current_request[ params['id'] ]
|
@abort( params['id'] )
|
||||||
@current_request[ params['id'] ].abort()
|
|
||||||
@current_request[ params['id'] ] = $.ajax( data )
|
@current_request[ params['id'] ] = $.ajax( data )
|
||||||
|
return params['id']
|
||||||
|
|
||||||
|
# generate a uniq rand id
|
||||||
|
params['id'] = 'rand-' + new Date().getTime() + '-' + Math.floor( Math.random() * 99999 )
|
||||||
|
|
||||||
|
# queue request
|
||||||
|
if params['queue']
|
||||||
|
@queue_list.push data
|
||||||
|
if !@queue_running
|
||||||
|
@_run()
|
||||||
|
|
||||||
|
# execute request
|
||||||
else
|
else
|
||||||
if params['queue']
|
@current_request[ params['id'] ] = $.ajax(data)
|
||||||
@queue_list.push data
|
|
||||||
if !@queue_running
|
params['id']
|
||||||
@_run()
|
|
||||||
else
|
abort: (id) =>
|
||||||
$.ajax(data)
|
|
||||||
|
# abort current_request
|
||||||
|
if @current_request[ id ]
|
||||||
|
@current_request[ id ].abort()
|
||||||
|
delete @current_request[ id ]
|
||||||
|
|
||||||
|
# remove from queue list
|
||||||
|
@queue_list = _.filter(
|
||||||
|
@queue_list
|
||||||
|
(item) ->
|
||||||
|
return item if item['id'] isnt id
|
||||||
|
return
|
||||||
|
)
|
||||||
|
|
||||||
_run: =>
|
_run: =>
|
||||||
if @queue_list && @queue_list[0]
|
if @queue_list && @queue_list[0]
|
||||||
|
@ -82,7 +112,7 @@ class _ajaxSingleton
|
||||||
request.complete = =>
|
request.complete = =>
|
||||||
@queue_running = false
|
@queue_running = false
|
||||||
@_run()
|
@_run()
|
||||||
$.ajax( request )
|
@current_request[ request['id'] ] = $.ajax( request )
|
||||||
|
|
||||||
_show_spinner: =>
|
_show_spinner: =>
|
||||||
@count++
|
@count++
|
||||||
|
|
|
@ -2,7 +2,7 @@ class App.Auth
|
||||||
|
|
||||||
@login: (params) ->
|
@login: (params) ->
|
||||||
App.Log.notice 'Auth', 'login', params
|
App.Log.notice 'Auth', 'login', params
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'login',
|
id: 'login',
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: App.Config.get('api_path') + '/signin',
|
url: App.Config.get('api_path') + '/signin',
|
||||||
|
@ -22,7 +22,7 @@ class App.Auth
|
||||||
|
|
||||||
@loginCheck: ->
|
@loginCheck: ->
|
||||||
App.Log.notice 'Auth', 'loginCheck'
|
App.Log.notice 'Auth', 'loginCheck'
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'login_check'
|
id: 'login_check'
|
||||||
async: false
|
async: false
|
||||||
type: 'GET'
|
type: 'GET'
|
||||||
|
@ -38,7 +38,7 @@ class App.Auth
|
||||||
|
|
||||||
@logout: ->
|
@logout: ->
|
||||||
App.Log.notice 'Auth', 'logout'
|
App.Log.notice 'Auth', 'logout'
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'logout'
|
id: 'logout'
|
||||||
type: 'DELETE'
|
type: 'DELETE'
|
||||||
url: App.Config.get('api_path') + '/signout'
|
url: App.Config.get('api_path') + '/signout'
|
||||||
|
|
|
@ -100,7 +100,7 @@ class _i18nSingleton extends Spine.Module
|
||||||
@locale = locale
|
@locale = locale
|
||||||
|
|
||||||
@map = {}
|
@map = {}
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'i18n-set-' + locale,
|
id: 'i18n-set-' + locale,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: App.Config.get('api_path') + '/translations/lang/' + locale,
|
url: App.Config.get('api_path') + '/translations/lang/' + locale,
|
||||||
|
|
|
@ -291,7 +291,7 @@ class _webSocketSingleton extends App.Controller
|
||||||
if @_ajaxInitWorking
|
if @_ajaxInitWorking
|
||||||
@_ajaxInitWorking.abort()
|
@_ajaxInitWorking.abort()
|
||||||
# call init request
|
# call init request
|
||||||
@_ajaxInitWorking = App.Com.ajax(
|
@_ajaxInitWorking = App.Ajax.request(
|
||||||
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' } })
|
||||||
|
@ -327,7 +327,7 @@ class _webSocketSingleton extends App.Controller
|
||||||
_ajaxSendQueue: =>
|
_ajaxSendQueue: =>
|
||||||
while !_.isEmpty(@queue)
|
while !_.isEmpty(@queue)
|
||||||
data = @queue.shift()
|
data = @queue.shift()
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @Config.get('api_path') + '/message_send'
|
url: @Config.get('api_path') + '/message_send'
|
||||||
data: JSON.stringify({ client_id: @client_id, data: data })
|
data: JSON.stringify({ client_id: @client_id, data: data })
|
||||||
|
@ -346,7 +346,7 @@ class _webSocketSingleton extends App.Controller
|
||||||
return if !@client_id
|
return if !@client_id
|
||||||
return if @_ajaxReceiveWorking is true
|
return if @_ajaxReceiveWorking is true
|
||||||
@_ajaxReceiveWorking = true
|
@_ajaxReceiveWorking = true
|
||||||
App.Com.ajax(
|
App.Ajax.request(
|
||||||
id: 'message_receive',
|
id: 'message_receive',
|
||||||
type: 'POST'
|
type: 'POST'
|
||||||
url: @Config.get('api_path') + '/message_receive'
|
url: @Config.get('api_path') + '/message_receive'
|
||||||
|
|
Loading…
Reference in a new issue