Merge pull request #2610 from luisramos0/cookies_banner_bug

[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
This commit is contained in:
Pau Pérez Fabregat
2018-09-03 17:23:17 +02:00
committed by GitHub
4 changed files with 52 additions and 16 deletions

View File

@@ -3,3 +3,4 @@ Darkswarm.controller "CookiesBannerCtrl", ($scope, CookiesBannerService, $http,
$scope.acceptCookies = ->
$http.post('/api/cookies/consent')
CookiesBannerService.close()
CookiesBannerService.disable()

View File

@@ -2,5 +2,5 @@ Darkswarm.directive 'cookiesBanner', (CookiesBannerService) ->
restrict: 'A'
link: (scope, elm, attr)->
return if not attr.cookiesBanner? || attr.cookiesBanner == 'false'
CookiesBannerService.setActive()
CookiesBannerService.enable()
CookiesBannerService.open()

View File

@@ -2,10 +2,10 @@ Darkswarm.factory "CookiesBannerService", (Navigation, $modal, $location, Redire
new class CookiesBannerService
modalMessage: null
isActive: false
isEnabled: false
open: (path, template = 'darkswarm/cookies_banner/cookies_banner.html') =>
return unless @isActive
return unless @isEnabled
@modalInstance = $modal.open
templateUrl: template
windowClass: "cookies-banner full"
@@ -13,8 +13,11 @@ Darkswarm.factory "CookiesBannerService", (Navigation, $modal, $location, Redire
keyboard: false
close: =>
return unless @isActive
return unless @isEnabled
@modalInstance.close()
setActive: =>
@isActive = true
enable: =>
@isEnabled = true
disable: =>
@isEnabled = false