summaryrefslogtreecommitdiffstats
path: root/js/app/services/request.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'js/app/services/request.coffee')
-rw-r--r--js/app/services/request.coffee37
1 files changed, 2 insertions, 35 deletions
diff --git a/js/app/services/request.coffee b/js/app/services/request.coffee
index e0e24bb44..ec8ccf70c 100644
--- a/js/app/services/request.coffee
+++ b/js/app/services/request.coffee
@@ -26,14 +26,7 @@ angular.module('News').factory '_Request', ->
class Request
- constructor: (@_$http, @_publisher, @_router) ->
- @_initialized = false
- @_shelvedRequests = []
-
- @_router.registerLoadedCallback =>
- @_initialized = true
- @_executeShelvedRequests()
- @_shelvedRequests = []
+ constructor: (@_$http, @_publisher, @_utils) ->
request: (route, data={}) ->
@@ -58,12 +51,7 @@ angular.module('News').factory '_Request', ->
angular.extend(defaultData, data)
- # if routes are not ready yet, save the request
- if not @_initialized
- @_shelveRequest(route, defaultData)
- return
-
- url = @_router.generate(route, defaultData.routeParams)
+ url = @_utils.generateUrl(route, defaultData.routeParams)
defaultConfig =
url: url
@@ -126,25 +114,4 @@ angular.module('News').factory '_Request', ->
@request(route, data)
- _shelveRequest: (route, data) ->
- ###
- Saves requests for later if the routes have not been loaded
- ###
- request =
- route: route
- data: data
-
- @_shelvedRequests.push(request)
-
-
- _executeShelvedRequests: ->
- ###
- Run all saved requests that were done before routes were fully
- loaded
- ###
- for r in @_shelvedRequests
- @request(r.route, r.data)
-
-
-
return Request