raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update $qProvider configuration

Browse Source 
The default logic for how rejected promises are handled has changed slightly. This reinstates the previous default behaviour.
This commit is contained in:
Matt-Yorkley
2021-08-02 23:01:28 +01:00
parent d268cc7bb7
commit 5fb782aeba
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/admin_ofn.js.coffee
View File

@@ -10,6 +10,7 @@ angular.module("ofn.admin", [
"admin.taxons",
"infinite-scroll",
"admin.orders"
]).config ($httpProvider, $locationProvider) ->
]).config ($httpProvider, $locationProvider, $qProvider) ->
$httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
$locationProvider.hashPrefix('')
$qProvider.errorOnUnhandledRejections(false)

3
app/assets/javascripts/darkswarm/darkswarm.js.coffee
View File

@@ -12,9 +12,10 @@ angular.module("Darkswarm", [
'angularFileUpload',
'angularSlideables',
'OFNShared'
]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider, $qProvider) ->
$httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
$httpProvider.defaults.headers.common['Accept'] = "application/json, text/javascript, */*"
$locationProvider.hashPrefix('')
$qProvider.errorOnUnhandledRejections(false)
# We manually handle our scrolling
$anchorScrollProvider.disableAutoScrolling()

10
spec/javascripts/unit/admin/enterprises/controllers/permalink_controller_spec.js.coffee
View File

@@ -49,9 +49,11 @@ describe "permalinkCtrl", ->
it "does nothing when PermalinkChecker rejects", ->
$scope.availability = "Some Availability"
deferred.reject()
promise = deferred.promise
spyOn(PermalinkChecker, "check").and.returnValue promise
$scope.$apply Enterprise.permalink = "somethingelse" # Change the permalink
try
deferred.reject()
promise = deferred.promise
spyOn(PermalinkChecker, "check").and.returnValue promise
$scope.$apply Enterprise.permalink = "somethingelse" # Change the permalink
expect($scope.availability).toEqual "Some Availability"
expect(Enterprise.permalink).toEqual "somethingelse"