From 5b57737c5f0ad62f5eddb72fae11bc69156c15c6 Mon Sep 17 00:00:00 2001 From: Enoc Date: Thu, 24 Jun 2021 00:12:11 -0600 Subject: [PATCH 1/2] Avoid showing more than once analitics consent --- assets/javascripts/app/app.coffee | 3 ++- assets/javascripts/lib/page.coffee | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index b55e552c8b..0aaf3c281a 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -11,6 +11,7 @@ try @initErrorTracking() catch return unless @browserCheck() + @showAnaliticsOne = false @el = $('._app') @localStorage = new LocalStorageStore @serviceWorker = new app.ServiceWorker if app.ServiceWorker.isEnabled() @@ -216,7 +217,7 @@ onCookieBlocked: (key, value, actual) -> return if @cookieBlocked @cookieBlocked = true - new app.views.Notif 'CookieBlocked', autoHide: null + new app.views.Notif 'CookieBlocked', autoHide: 2000 Raven.captureMessage "CookieBlocked/#{key}", level: 'warning', extra: {value, actual} return diff --git a/assets/javascripts/lib/page.coffee b/assets/javascripts/lib/page.coffee index 7a5329f6a8..bd4ca2ae98 100644 --- a/assets/javascripts/lib/page.coffee +++ b/assets/javascripts/lib/page.coffee @@ -200,7 +200,9 @@ page.track = (fn) -> track = -> return unless app.config.env == 'production' + return if app.analiticsAlreadyShown + app.analiticsAlreadyShown = true consentGiven = Cookies.get('analyticsConsent') consentAsked = Cookies.get('analyticsConsentAsked') @@ -210,7 +212,7 @@ track = -> # Only ask for consent once per browser session Cookies.set('analyticsConsentAsked', '1') - new app.views.Notif 'AnalyticsConsent', autoHide: null + new app.views.Notif 'AnalyticsConsent', autoHide: 2000 return @resetAnalytics = -> From fb09d8714c2ce7770394dce42db9a88a495ea33e Mon Sep 17 00:00:00 2001 From: Enoc Date: Fri, 25 Jun 2021 23:50:05 -0600 Subject: [PATCH 2/2] fix variable's name --- assets/javascripts/app/app.coffee | 2 +- assets/javascripts/lib/page.coffee | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index 0aaf3c281a..b19068f8da 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -11,7 +11,7 @@ try @initErrorTracking() catch return unless @browserCheck() - @showAnaliticsOne = false + @analiticsAlreadyShown = false @el = $('._app') @localStorage = new LocalStorageStore @serviceWorker = new app.ServiceWorker if app.ServiceWorker.isEnabled() diff --git a/assets/javascripts/lib/page.coffee b/assets/javascripts/lib/page.coffee index bd4ca2ae98..966a4bd323 100644 --- a/assets/javascripts/lib/page.coffee +++ b/assets/javascripts/lib/page.coffee @@ -202,7 +202,9 @@ track = -> return unless app.config.env == 'production' return if app.analiticsAlreadyShown + # only show the analitics cookie notification once app.analiticsAlreadyShown = true + consentGiven = Cookies.get('analyticsConsent') consentAsked = Cookies.get('analyticsConsentAsked')