diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index ad6c3a091..fa835db0d 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -604,8 +604,7 @@ class App.Controller extends Spine.Controller # get data @tickets = {} - ajax = new App.Ajax - ajax.ajax( + App.Com.ajax( type: 'GET', url: '/ticket_customer', data: { diff --git a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee index 202bf7752..4df1ce12e 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee @@ -18,10 +18,8 @@ class App.DashboardActivityStream extends App.Controller @render( window.LastRefresh[ 'dashboard_activity_stream' ] ) # get data - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'dashoard_activity_stream', type: 'GET', url: '/activity_stream', data: { diff --git a/app/assets/javascripts/app/controllers/_dashboard/recent_viewed.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/recent_viewed.js.coffee index 9a4c91b14..7b64c132c 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/recent_viewed.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/recent_viewed.js.coffee @@ -11,10 +11,8 @@ class App.DashboardRecentViewed extends App.Controller @items = [] # get data - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'dashboard_recent_viewed', type: 'GET', url: '/recent_viewed', data: { diff --git a/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee index f35af5d63..3b5ec613c 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/rss.js.coffee @@ -15,10 +15,8 @@ class App.DashboardRss extends App.Controller @render( window.LastRefresh[ 'dashboard_rss' ] ) # get data - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'dashboard_rss', type: 'GET', url: '/rss_fetch', data: { diff --git a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee index 9886711ef..785a02f25 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee @@ -26,10 +26,8 @@ class App.DashboardTicket extends App.Controller @render( window.LastRefresh[ @key ] ) # get data - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'dashboard_ticket_' + @key, type: 'GET', url: '/ticket_overviews', data: { diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index bb84f4029..c2cc9ca83 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -27,10 +27,8 @@ class Index extends App.Controller # get data / in case also ticket data for split fetch: (params) -> - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'ticket_create', type: 'GET', url: '/ticket_create', data: { diff --git a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee index 865404d50..dfde180e3 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee @@ -5,8 +5,8 @@ class App.TicketHistory extends App.ControllerModal fetch: (@ticket_id) -> # get data - @ajax = new App.Ajax - @ajax.ajax( + App.Com.ajax( + id: 'ticket_history', type: 'GET', url: '/ticket_history/' + ticket_id, success: (data, status, xhr) => diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee index 37d104179..6776b1616 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee @@ -16,8 +16,8 @@ class App.TicketMerge extends App.ControllerModal params = @formParam(e.target) # merge tickets - @ajax = new App.Ajax - @ajax.ajax( + App.Com.ajax( + id: 'ticket_merge', type: 'GET', url: '/ticket_merge/' + @ticket_id + '/' + params['master_ticket_number'], data: { diff --git a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee index a09e61a72..a31a23bc5 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee @@ -45,10 +45,8 @@ class Index extends App.Controller @render() # get data - if @req - @req.abort() - @ajax = new App.Ajax - @req = @ajax.ajax( + App.Com.ajax( + id: 'ticket_overview', type: 'GET', url: '/ticket_overviews', data: { diff --git a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee index 9c2eafd66..68b833a17 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee @@ -30,8 +30,8 @@ class Index extends App.Controller fetch: (ticket_id) -> # get data - @ajax = new App.Ajax - @ajax.ajax( + App.Com.ajax( + id: 'ticket_zoom', type: 'GET', url: '/ticket_full/' + ticket_id, data: { diff --git a/app/assets/javascripts/app/controllers/getting_started.js.coffee b/app/assets/javascripts/app/controllers/getting_started.js.coffee index 484d6a495..1bab213d7 100644 --- a/app/assets/javascripts/app/controllers/getting_started.js.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.js.coffee @@ -22,8 +22,8 @@ class Index extends App.Controller fetch: -> # get data - @ajax = new App.Ajax - @ajax.ajax( + App.Com.ajax( + id: 'getting_started', type: 'GET', url: '/getting_started', data: { diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index 3d1739412..f71c179f2 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -138,9 +138,8 @@ class App.Navigation extends App.Controller # only of lod request is already done if !@req_overview - @ajax = new App.Ajax -# @req_overview.abort() - @req_overview = @ajax.ajax( + @req_overview = App.Com.ajax( + id: 'navbar_ticket_overviews', type: 'GET', url: '/ticket_overviews', data: {}, @@ -184,8 +183,8 @@ class App.Navigation extends App.Controller # only of lod request is already done if !@req_recent_viewed - @ajax = new App.Ajax - @req_recent_viewed = @ajax.ajax( + @req_recent_viewed = App.Com.ajax( + id: 'navbar_recent_viewed', type: 'GET', url: '/recent_viewed', data: { diff --git a/app/assets/javascripts/app/controllers/reset_password.js.coffee b/app/assets/javascripts/app/controllers/reset_password.js.coffee index aec66bdf8..6d2d4b5a9 100644 --- a/app/assets/javascripts/app/controllers/reset_password.js.coffee +++ b/app/assets/javascripts/app/controllers/reset_password.js.coffee @@ -30,8 +30,8 @@ class Index extends App.Controller params = @formParam(e.target) # get data - ajax = new App.Ajax - ajax.ajax( + App.Com.ajax( + id: 'password_reset', type: 'POST', url: '/users/password_reset', data: JSON.stringify(params), @@ -63,10 +63,10 @@ class Verify extends App.Controller @navupdate '#reset_password_verify' # get data - ajax = new App.Ajax params = {} params['token'] = @token - ajax.ajax( + App.Com.ajax( + id: 'passwort_reset_verify', type: 'POST', url: '/users/password_reset_verify', data: JSON.stringify(params), @@ -96,8 +96,8 @@ class Verify extends App.Controller params['token'] = @token # get data - ajax = new App.Ajax - ajax.ajax( + App.Com.ajax( + id: 'password_reset_verify', type: 'POST', url: '/users/password_reset_verify', data: JSON.stringify(params),