j1-template 2022.0.7 → 2022.0.8

data/assets/themes/j1/adapter/js/translator.js

@@ -35,6 +35,9 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookie_defaults     = modules.defaults.cookies.defaults %}
+{% assign cookie_settings     = modules.cookies.settings %}
+
 {% assign translator_defaults = modules.defaults.translator.defaults %}
 {% assign translator_settings = modules.translator.settings %}
 {% assign tracking_enabled    = template_config.analytics.enabled %}
@@ -42,6 +45,7 @@ regenerate:                             true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign translator_options  = translator_defaults | merge: translator_settings %}
+{% assign cookie_options      = cookie_defaults | merge: cookie_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -95,6 +99,7 @@ j1.adapter['translator'] = (function (j1, window) {
   var hostname;
   var domain;
   var cookie_domain;
+  var domain_enabled;
   var secure;
   var logText;
   var cookie_written;
@@ -111,10 +116,17 @@ j1.adapter['translator'] = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // setCookie()
-  // writes a flat cookie (not using an encoded JSON string)
+  // writes a FLAT cookie (not using an encoded JSON string)
   // ---------------------------------------------------------------------------
   function setCookie(options /*cName, cValue, expDays*/) {
-    var defaults = {};
+    var date            = new Date();
+    var timestamp_now   = date.toISOString()
+    var url             = new liteURL(window.location.href);
+    var baseUrl         = url.origin;;
+    var hostname        = url.hostname;
+    var domain          = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+    var domain_enabled  = '{{cookie_options.domain}}';
+    var defaults        = {};
     var settings;
     var document_cookie;
     var stringifiedAttributes = '';
@@ -123,7 +135,7 @@ j1.adapter['translator'] = (function (j1, window) {
         name: '',
         path: '/',
         expires: 0,
-        domain: 'localhost',
+        domain: true,
         samesite: 'Lax',
         http_only: false,
         secure: false
@@ -137,6 +149,13 @@ j1.adapter['translator'] = (function (j1, window) {
       stringifiedAttributes += '; ' + 'expires=' + date.toUTCString();
     }
 
+    if (domain != hostname) {
+      settings.domain = domain_enabled ? '.' + domain : hostname;
+    } else {
+      settings.domain = hostname;
+    }
+    stringifiedAttributes += '; ' + 'domain=' + settings.domain;
+
     stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
 
     if (settings.secure) {
@@ -168,7 +187,7 @@ j1.adapter['translator'] = (function (j1, window) {
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
+      domain_enabled        = '{{cookie_options.domain}}';
       secure                = (url.protocol.includes('https')) ? true : false;
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
@@ -188,22 +207,8 @@ j1.adapter['translator'] = (function (j1, window) {
         'translationLanguage':      translation_language,
       };
 
-      // load|initialize user translate cookie
-      if (j1.existsCookie(cookie_names.user_translate)) {
-        user_translate = j1.readCookie(cookie_names.user_translate);
-      } else {
-        logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
-        cookie_written = j1.writeCookie({
-          name:     cookie_names.user_translate,
-          data:     user_translate,
-          secure:   secure,
-          expires:  365
-        });
-      }
-
       // initialize state flag
       _this.state = 'pending';
-      // _this.settings.languageList = '/assets/data/ms_select.json';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -228,7 +233,30 @@ j1.adapter['translator'] = (function (j1, window) {
       // initializer
       // -----------------------------------------------------------------------
       var dependencies_met_page_ready = setInterval (function (options) {
-        user_consent = j1.readCookie(cookie_names.user_consent);
+        var expires   = '{{cookie_options.expires}}';
+        var same_site = '{{cookie_options.same_site}}';
+        user_consent    = j1.readCookie(cookie_names.user_consent);
+
+        // set domain used by cookies
+        if (domain != hostname) {
+          cookie_domain = domain_enabled ? '.' + domain : hostname;
+        } else {
+          cookie_domain = hostname;
+        }
+
+        // load|initialize user translate cookie
+        if (j1.existsCookie(cookie_names.user_translate)) {
+          user_translate = j1.readCookie(cookie_names.user_translate);
+        } else {
+          logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+          cookie_written = j1.writeCookie({
+            name:     cookie_names.user_translate,
+            data:     user_translate,
+            samesite: 'Strict',
+            secure:   secure,
+            expires:  365
+          });
+        }
 
         if ( j1.getState() === 'finished' ) {
           _this.setState('started');
@@ -256,15 +284,28 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           }
 
-          // update user_translate cookie
-          user_translate.analysis         = user_consent.analysis;
-          user_translate.personalization  = user_consent.personalization;
-          cookie_written = j1.writeCookie({
-            name:     cookie_names.user_translate,
-            data:     user_translate,
-            secure:   secure,
-            expires:  365
-          });
+          // load|set user translate cookie
+          user_translate = j1.readCookie(cookie_names.user_translate);
+          if (!user_consent.analysis || !user_consent.personalization) {
+            // disable translation service
+            user_translate.translationEnabled = false;
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_translate,
+              data:     user_translate,
+              secure:   secure
+            });
+
+            // expire permanent cookie to session
+            j1.expireCookie({ name: cookie_names.user_translate });
+          } else {
+            logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_translate,
+              data:     user_translate,
+              secure:   secure,
+              expires:  365
+            });
+          }
 
           if (moduleOptions.dialogLanguage === 'auto') {
             moduleOptions.dialogLanguage = '{{contentLanguage}}';
@@ -272,7 +313,11 @@ j1.adapter['translator'] = (function (j1, window) {
 
           j1.translator = new Translator({
             contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
-            cookieName:               moduleOptions.cookieName,                 // the name of the User State Cookie (primary data)
+            cookieName:               cookie_names.user_translate,              // name of the translator cookie
+            cookieStorageDays:        expires,                                  // lifetime of a cookie [0..365], 0: session cookie
+            cookieSameSite:           same_site,                                // restrict consent cookie
+            cookieDomain:             cookie_domain,                            // set domain (hostname|domain)
+            cookieSecure:             secure,                                   // set
             cookieConsentName:        moduleOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
             disableLanguageSelector:  moduleOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
             dialogContainerID:        moduleOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
@@ -286,7 +331,7 @@ j1.adapter['translator'] = (function (j1, window) {
           });
 
           // enable|disable translation (after callback)
-          if (user_consent.analysis && user_consent.personalization && user_translate.translationEnabled) {
+          if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
             if (moduleOptions.translatorName === 'google') {
               head.appendChild(script);
               if ($('google_translate_element')) {
@@ -302,12 +347,9 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           }
 
-          // Click events moved to Navigator (core)
-          //
-          // $('#quickLinksTranslateButton').click(function(e) {
-          //   logger.info('\n' + 'call default action');
-          //   j1.translator.showDialog();
-          // });
+          // -------------------------------------------------------------------
+          // NOTE: Click events moved to Navigator (core)
+          // -------------------------------------------------------------------
 
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());
@@ -374,34 +416,37 @@ j1.adapter['translator'] = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // cbGoogle()
-    // Called by the translator CORE module after the user made the
-    // selection for a translation|language
+    // Called by the translator CORE module after the user has made
+    // the selection for a translation|language
     // -------------------------------------------------------------------------
     cbGoogle: function () {
       var logger         = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
       var cookie_names   = j1.getCookieNames();
-      var user_state     = j1.readCookie(cookie_names.user_state);
       var user_consent   = j1.readCookie(cookie_names.user_consent);
       var user_translate = j1.readCookie(cookie_names.user_translate);
       var msDropdown     = document.getElementById('dropdownJSON').msDropdown;
+      var url            = new liteURL(window.location.href);
+      var baseUrl        = url.origin;;
+      var hostname       = url.hostname;
+      var domain         = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var domain_enabled = '{{cookie_options.domain}}';
+      var same_site      = '{{cookie_options.same_site}}';
+
       var selectedTranslationLanguage;
       var srcLang;
       var destLang;
       var transCode;
 
-      selectedTranslationLanguage = msDropdown.value;
-      logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
-      // update cookie consent settings
-      user_consent.analysis         = user_translate.analysis;
-      user_consent.personalization  = user_translate.personalization;
+      // set domain used by cookies
+      if (domain != hostname) {
+        cookie_domain = domain_enabled ? '.' + domain : hostname;
+      } else {
+        cookie_domain = hostname;
+      }
 
-      cookie_written = j1.writeCookie({
-        name:     cookie_names.user_consent,
-        data:     user_consent,
-        secure:   secure,
-        expires:  365
-      });
+      selectedTranslationLanguage = msDropdown.value;
+      logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
       // set content language
       if (moduleOptions.contentLanguage === 'auto') {
@@ -427,8 +472,17 @@ j1.adapter['translator'] = (function (j1, window) {
       Cookies.remove('googtrans', { domain: hostname });
       Cookies.remove('googtrans');
 
-      // write the googtrans cookie w/o DOMAIN!
-      Cookies.set('googtrans', transCode);
+      // -----------------------------------------------------------------------
+      // NOTE: googtrans cookie will be rewritten (by Google!?) for
+      // attributes 'SameSite' and potentially 'Domain'. This results
+      // for 'SameSite' in an empty field!
+      // -----------------------------------------------------------------------
+
+      // write the googtrans cookie (w/o DOMAIN?!)
+      Cookies.set('googtrans', transCode, {
+        Domain:    cookie_domain,
+        sameSite:  'Lax'
+      });
 
       // reload current page (skip cache)
       location.reload(true);

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js

@@ -38,7 +38,7 @@
 
 'use strict';
 function CookieConsent(props) {
-  var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
+  var logger                = log4javascript.getLogger('j1.core.CookieConsent');
   var self                  = this;
   var detailedSettingsShown = false;
   var url                   = new liteURL(window.location.href);
@@ -56,14 +56,10 @@ function CookieConsent(props) {
     dialogLanguage:         'content',                                          // language used for the consent dialog (modal)
     dialogLanguages:        ['en','de'],                                        // supported languages for the consent dialog (modal), defaults to first in array
     contentURL:             '/assets/data/cookieconsent',                       // URL contain the consent dialogs (modals) for ALL supported languages
-    cookieName:             'j1.user.translate',                                // name of the cookie, in which the configuration is stored
-    cookieStorageDays:      365,                                                // duration the configuration cookie is stored on the client
     postSelectionCallback:  '',                                                 // callback function, called after the user has made his selection
     whitelisted:            [],                                                 // pages NO consent modal dialog is issued
     xhrDataElement:         'consent-data',                                     // src container for all language-specific consent dialogs (taken from contentURL)
-    dialogContainerID:      'consent-modal',                                    // dest container, the dialog modal is loaded (dynamically)
-    cookieSameSite:         'Lax',                                           // restrict the consent cookie to first-party (do NOT send cookie to other domains)
-    cookieSecure:           true
+    dialogContainerID:      'consent-modal'                                     // dest container, the dialog modal is loaded (dynamically)
   };
 
   // merge property settings
@@ -87,7 +83,7 @@ function CookieConsent(props) {
   this.props.cookieSecure = cookieSecure;
 
   var Cookie = {
-    set: function (name, value, days, cookieSameSite, cookieSecure) {
+    set: function (name, value, days, cookieSameSite, cookieDomain, cookieSecure) {
       var value_encoded = window.btoa(value);
       var expires = '; expires=Thu, 01 Jan 1970 00:00:00 UTC';
       if (days>0) {
@@ -96,9 +92,9 @@ function CookieConsent(props) {
         expires = "; expires=" + date.toUTCString();
       }
       if (cookieSecure) {
-        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; cookieSameSite=' + cookieSameSite + '; ' + 'cookieSecure=' + cookieSecure + ';';
+        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; SameSite=' + cookieSameSite + '; ' + 'Domain=' + cookieDomain + '; ' + 'Secure=' + cookieSecure + ';';
       } else {
-        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; cookieSameSite=' + cookieSameSite + ';';
+        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; SameSite=' + cookieSameSite + ';' + 'Domain=' + cookieDomain + '; ';
       }
     },
     get: function (name) {
@@ -319,20 +315,41 @@ function CookieConsent(props) {
   }
 
   function agreeAll() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
+    Cookie.set(
+      self.props.cookieName,
+      JSON.stringify(gatherOptions(true)),
+      self.props.cookieStorageDays,
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      cookieSecure
+    );
     self.$modal.modal('hide');
   }
 
   function doNotAgree() {
     // Remove consent cookie
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), 0, self.props.cookieSameSite, cookieSecure);
+    Cookie.set(
+      self.props.cookieName,
+      JSON.stringify(gatherOptions(false)),
+      0,
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      cookieSecure
+    );
     self.$modal.modal('hide');
     // redirect to error page: blocked site
     window.location.href = '/445.html';
   }
 
   function saveSettings() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
+    Cookie.set(
+      self.props.cookieName,
+      JSON.stringify(gatherOptions()),
+      self.props.cookieStorageDays,
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      cookieSecure
+    );
     self.$modal.modal('hide');
   }
 
@@ -346,7 +363,6 @@ function CookieConsent(props) {
 
   // API functions
   // ---------------------------------------------------------------------------
-
   logger.info('\n' + 'initializing core module finished');
   logger.info('\n' + 'state: finished');
 

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js

@@ -24,4 +24,4 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-"use strict";function CookieConsent(d){var v=log4javascript.getLogger("j1.core.bsCookieConsent");var p=this;var q=false;var e=new liteURL(window.location.href);var c=(e.protocol.includes("https"))?true:false;var j;var g;var t;v.info("\ninitializing core module: started");v.info("\nstate: started");this.props={autoShowDialog:true,dialogLanguage:"content",dialogLanguages:["en","de"],contentURL:"/assets/data/cookieconsent",cookieName:"j1.user.translate",cookieStorageDays:365,postSelectionCallback:"",whitelisted:[],xhrDataElement:"consent-data",dialogContainerID:"consent-modal",cookieSameSite:"Strict",cookieSecure:true};for(var f in d){this.props[f]=d[f]}if(this.props.dialogLanguage.indexOf("-")!==-1){this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]}if(!this.props.dialogLanguages.includes(this.props.dialogLanguage)){this.props.dialogLanguage=this.props.dialogLanguages[0]}this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage;this.props.cookieSecure=c;var h={set:function(z,B,D,A,x){var C=window.btoa(B);var w="; expires=Thu, 01 Jan 1970 00:00:00 UTC";if(D>0){var y=new Date();y.setTime(y.getTime()+(D*24*60*60*1000));w="; expires="+y.toUTCString()}if(x){document.cookie=z+"="+(C||"")+w+"; Path=/; cookieSameSite="+A+"; cookieSecure="+x+";"}else{document.cookie=z+"="+(C||"")+w+"; Path=/; cookieSameSite="+A+";"}},get:function(x){var A=x+"=";var w=document.cookie.split(";");for(var y=0;y<w.length;y++){var C=w[y];while(C.charAt(0)===" "){C=C.substring(1,C.length)}if(C.indexOf(A)===0){var B=C.substring(A.length,C.length);var z=window.atob(B);return z}}return undefined}};var n={documentReady:function(w){if(document.readyState!=="loading"){w()}else{document.addEventListener("DOMContentLoaded",w)}}};function u(){var w={};var x=false;var y=0;var z=arguments.length;if(Object.prototype.toString.call(arguments[0])==="[object Boolean]"){x=arguments[0];y++}var B=function(C){for(var D in C){if(Object.prototype.hasOwnProperty.call(C,D)){if(x&&Object.prototype.toString.call(C[D])==="[object Object]"){w[D]=u(true,w[D],C[D])}else{w[D]=C[D]}}}};for(;y<z;y++){var A=arguments[y];B(A)}return w}function i(B,y){var w=Array.prototype.slice.call(arguments,2);var A=B.split(".");var z=A.pop();for(var x=0;x<A.length;x++){y=y[A[x]]}return y[z].apply(y,w)}function m(w){n.documentReady(function(){p.modal=document.getElementById(p.props.dialogContainerID);if(!p.modal){v.info("\nload consent modal");p.modal=document.createElement("div");p.modal.id=p.props.dialogContainerID;p.modal.style.display="none";p.modal.setAttribute("class","modal fade");p.modal.setAttribute("tabindex","-1");p.modal.setAttribute("role","dialog");p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID);document.body.append(p.modal);p.$modal=$(p.modal);p.$modal.on("hidden.bs.modal",function(){i(p.props.postSelectionCallback,window)});var x=p.props.contentURL+"/index.html";$.get(x).done(function(y){v.info("\nloading consent modal: successfully");p.modal.innerHTML=y;p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html();p.modal.style.display="block";$(p.modal).modal({backdrop:"static",keyboard:false});p.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");p.$buttonAgree=$("#bccs-buttonAgree");p.$buttonSave=$("#bccs-buttonSave");p.$buttonAgreeAll=$("#bccs-buttonAgreeAll");v.info("\nload/initialze options from cookie");l();k();$("#bccs-options").on("hide.bs.collapse",function(){q=false;l()}).on("show.bs.collapse",function(){q=true;l()});v.info("\ninitialze event handler");p.$buttonDoNotAgree.click(function(){b()});p.$buttonAgree.click(function(){o()});p.$buttonSave.click(function(){$("#bccs-options").collapse("hide");s();k()});p.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");o();k()});p.$modal.modal("show")}).fail(function(){v.error("\nloading consent modal: failed");v.warn("\nprobably no `contentURL` set")})}else{p.$modal.modal("show")}}.bind(this))}function k(){var y=p.getSettings();if(y){for(var x in y){var w=p.$modal.find("#bccs-options .bccs-option[data-name='"+x+"'] input[type='checkbox']");w.prop("checked",y[x])}}}function l(){if(q){p.$buttonDoNotAgree.hide();p.$buttonAgree.hide();p.$buttonSave.show();p.$buttonAgreeAll.show()}else{p.$buttonDoNotAgree.show();p.$buttonAgree.show();p.$buttonSave.hide();p.$buttonAgreeAll.hide()}}function a(x){var w=p.$modal.find("#bccs-options .bccs-option");var z={};for(var A=0;A<w.length;A++){var C=w[A];var y=C.getAttribute("data-name");if(y==="necessary"){z[y]=true}else{if(x===undefined){var B=$(C).find("input[type='checkbox']");z[y]=B.prop("checked")}else{z[y]=!!x}}}return z}function o(){h.set(p.props.cookieName,JSON.stringify(a(true)),p.props.cookieStorageDays,p.props.cookieSameSite,c);p.$modal.modal("hide")}function b(){h.set(p.props.cookieName,JSON.stringify(a(false)),0,p.props.cookieSameSite,c);p.$modal.modal("hide");window.location.href="/445.html"}function s(){h.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.cookieSameSite,c);p.$modal.modal("hide")}t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);var r=h.get(this.props.cookieName);if((r===undefined||r==="false")&&this.props.autoShowDialog&&!t){m()}v.info("\ninitializing core module finished");v.info("\nstate: finished");this.showDialog=function(){t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!t){m()}};this.getSettings=function(x){var w=h.get(p.props.cookieName);if(w){var y=JSON.parse(h.get(p.props.cookieName));if(x===undefined){return y}else{if(y){return y[x]}else{return false}}}else{return undefined}}};
+"use strict";function CookieConsent(d){var v=log4javascript.getLogger("j1.core.CookieConsent");var p=this;var q=false;var e=new liteURL(window.location.href);var c=(e.protocol.includes("https"))?true:false;var j;var g;var t;v.info("\ninitializing core module: started");v.info("\nstate: started");this.props={autoShowDialog:true,dialogLanguage:"content",dialogLanguages:["en","de"],contentURL:"/assets/data/cookieconsent",postSelectionCallback:"",whitelisted:[],xhrDataElement:"consent-data",dialogContainerID:"consent-modal"};for(var f in d){this.props[f]=d[f]}if(this.props.dialogLanguage.indexOf("-")!==-1){this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]}if(!this.props.dialogLanguages.includes(this.props.dialogLanguage)){this.props.dialogLanguage=this.props.dialogLanguages[0]}this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage;this.props.cookieSecure=c;var h={set:function(w,C,E,z,D,A){var B=window.btoa(C);var x="; expires=Thu, 01 Jan 1970 00:00:00 UTC";if(E>0){var y=new Date();y.setTime(y.getTime()+(E*24*60*60*1000));x="; expires="+y.toUTCString()}if(A){document.cookie=w+"="+(B||"")+x+"; Path=/; SameSite="+z+"; Domain="+D+"; Secure="+A+";"}else{document.cookie=w+"="+(B||"")+x+"; Path=/; SameSite="+z+";Domain="+D+"; "}},get:function(x){var A=x+"=";var w=document.cookie.split(";");for(var y=0;y<w.length;y++){var C=w[y];while(C.charAt(0)===" "){C=C.substring(1,C.length)}if(C.indexOf(A)===0){var B=C.substring(A.length,C.length);var z=window.atob(B);return z}}return undefined}};var n={documentReady:function(w){if(document.readyState!=="loading"){w()}else{document.addEventListener("DOMContentLoaded",w)}}};function u(){var w={};var x=false;var y=0;var z=arguments.length;if(Object.prototype.toString.call(arguments[0])==="[object Boolean]"){x=arguments[0];y++}var B=function(C){for(var D in C){if(Object.prototype.hasOwnProperty.call(C,D)){if(x&&Object.prototype.toString.call(C[D])==="[object Object]"){w[D]=u(true,w[D],C[D])}else{w[D]=C[D]}}}};for(;y<z;y++){var A=arguments[y];B(A)}return w}function i(B,y){var w=Array.prototype.slice.call(arguments,2);var A=B.split(".");var z=A.pop();for(var x=0;x<A.length;x++){y=y[A[x]]}return y[z].apply(y,w)}function m(w){n.documentReady(function(){p.modal=document.getElementById(p.props.dialogContainerID);if(!p.modal){v.info("\nload consent modal");p.modal=document.createElement("div");p.modal.id=p.props.dialogContainerID;p.modal.style.display="none";p.modal.setAttribute("class","modal fade");p.modal.setAttribute("tabindex","-1");p.modal.setAttribute("role","dialog");p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID);document.body.append(p.modal);p.$modal=$(p.modal);p.$modal.on("hidden.bs.modal",function(){i(p.props.postSelectionCallback,window)});var x=p.props.contentURL+"/index.html";$.get(x).done(function(y){v.info("\nloading consent modal: successfully");p.modal.innerHTML=y;p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html();p.modal.style.display="block";$(p.modal).modal({backdrop:"static",keyboard:false});p.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");p.$buttonAgree=$("#bccs-buttonAgree");p.$buttonSave=$("#bccs-buttonSave");p.$buttonAgreeAll=$("#bccs-buttonAgreeAll");v.info("\nload/initialze options from cookie");l();k();$("#bccs-options").on("hide.bs.collapse",function(){q=false;l()}).on("show.bs.collapse",function(){q=true;l()});v.info("\ninitialze event handler");p.$buttonDoNotAgree.click(function(){b()});p.$buttonAgree.click(function(){o()});p.$buttonSave.click(function(){$("#bccs-options").collapse("hide");s();k()});p.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");o();k()});p.$modal.modal("show")}).fail(function(){v.error("\nloading consent modal: failed");v.warn("\nprobably no `contentURL` set")})}else{p.$modal.modal("show")}}.bind(this))}function k(){var y=p.getSettings();if(y){for(var x in y){var w=p.$modal.find("#bccs-options .bccs-option[data-name='"+x+"'] input[type='checkbox']");w.prop("checked",y[x])}}}function l(){if(q){p.$buttonDoNotAgree.hide();p.$buttonAgree.hide();p.$buttonSave.show();p.$buttonAgreeAll.show()}else{p.$buttonDoNotAgree.show();p.$buttonAgree.show();p.$buttonSave.hide();p.$buttonAgreeAll.hide()}}function a(x){var w=p.$modal.find("#bccs-options .bccs-option");var z={};for(var A=0;A<w.length;A++){var C=w[A];var y=C.getAttribute("data-name");if(y==="necessary"){z[y]=true}else{if(x===undefined){var B=$(C).find("input[type='checkbox']");z[y]=B.prop("checked")}else{z[y]=!!x}}}return z}function o(){h.set(p.props.cookieName,JSON.stringify(a(true)),p.props.cookieStorageDays,p.props.cookieSameSite,p.props.cookieDomain,c);p.$modal.modal("hide")}function b(){h.set(p.props.cookieName,JSON.stringify(a(false)),0,p.props.cookieSameSite,p.props.cookieDomain,c);p.$modal.modal("hide");window.location.href="/445.html"}function s(){h.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.cookieSameSite,p.props.cookieDomain,c);p.$modal.modal("hide")}t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);var r=h.get(this.props.cookieName);if((r===undefined||r==="false")&&this.props.autoShowDialog&&!t){m()}v.info("\ninitializing core module finished");v.info("\nstate: finished");this.showDialog=function(){t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!t){m()}};this.getSettings=function(x){var w=h.get(p.props.cookieName);if(w){var y=JSON.parse(h.get(p.props.cookieName));if(x===undefined){return y}else{if(y){return y[x]}else{return false}}}else{return undefined}}};

data/assets/themes/j1/modules/translator/js/translator.js

@@ -37,6 +37,46 @@ function Translator(props) {
   var navigator_language;
   var translation_language;
 
+  // ---------------------------------------------------------------------------
+  // Cookie()
+  // manage cookies
+  // ---------------------------------------------------------------------------
+  var Cookie = {
+    set: function (name, value, days, cookieSameSite, cookieDomain, cookieSecure) {
+      var value_encoded = window.btoa(value);
+      var expires = '; expires=Thu, 01 Jan 1970 00:00:00 UTC';
+      if (days>0) {
+        var date = new Date();
+        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+        expires = "; expires=" + date.toUTCString();
+      }
+      if (cookieSecure) {
+        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; SameSite=' + cookieSameSite + '; ' + 'Domain=' + cookieDomain + '; ' + 'Secure=' + cookieSecure + ';';
+      } else {
+        document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; SameSite=' + cookieSameSite + ';' + 'Domain=' + cookieDomain + '; ';
+      }
+    },
+    get: function (name) {
+    var nameEQ = name + '=';
+    var ca = document.cookie.split(';');
+    for (var i = 0; i < ca.length; i++) {
+      var c = ca[i];
+      while (c.charAt(0) === ' ') {
+        c = c.substring(1, c.length);
+      }
+      if (c.indexOf(nameEQ) === 0) {
+        var value_encoded = c.substring(nameEQ.length, c.length);
+        var value         = window.atob(value_encoded);
+        return value;
+      }
+    }
+    return undefined;
+    }
+  };
+
+  logger.info('\n' + 'initializing core module: started');
+  logger.info('\n' + 'state: started');
+
   // ---------------------------------------------------------------------------
   // default property settings
   // ---------------------------------------------------------------------------
@@ -84,46 +124,33 @@ function Translator(props) {
   logger.info('\n' + 'initializing core module: started');
   logger.info('\n' + 'state: started');
 
-  // ---------------------------------------------------------------------------
-  // internal functions
-  // ---------------------------------------------------------------------------
+  var translationDefaultSettings = {
+    "translatorName":         "google",
+    "translationEnabled":     false,
+    "translateAllPages":      true,
+    "useLanguageFromBrowser": true,
+    "translationLanguage":    "de",
+    "analysis":               true,
+    "personalization":        true
+  };
+
+  var translatorCookie = Cookie.get(self.props.cookieName);
+  if (!translatorCookie) {
+    logger.info('\n' + 'initializing translator cookie: ' + self.props.cookieName);
+    // enable and write all settings required for translation (translation cookie)
+    Cookie.set(
+      self.props.cookieName,
+      JSON.stringify(translationDefaultSettings),
+      self.props.cookieStorageDays,
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
+    );
+  }
 
   // ---------------------------------------------------------------------------
-  // Cookie()
-  // manage cookies
+  // internal functions
   // ---------------------------------------------------------------------------
-  var Cookie = {
-    set: function (name, value, days, samesite, secure) {
-      var value_encoded = window.btoa(value);
-      var expires = '';
-      if (days) {
-        var date = new Date();
-        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-        expires = '; expires=' + date.toUTCString();
-      }
-      if (secure) {
-        document.cookie = name + '=' + (value_encoded || '') + expires + '; Path=/; SameSite=' + samesite + '; ' + 'secure=' + secure + ';';
-      } else {
-        document.cookie = name + '=' + (value_encoded || '') + expires + '; Path=/; SameSite=' + samesite + ';';
-      }
-    },
-    get: function (name) {
-    var nameEQ = name + '=';
-    var ca = document.cookie.split(';');
-    for (var i = 0; i < ca.length; i++) {
-      var c = ca[i];
-      while (c.charAt(0) === ' ') {
-        c = c.substring(1, c.length);
-      }
-      if (c.indexOf(nameEQ) === 0) {
-        var value_encoded = c.substring(nameEQ.length, c.length);
-        var value         = window.atob(value_encoded);
-        return value;
-      }
-    }
-    return undefined;
-    }
-  };
 
   // ---------------------------------------------------------------------------
   // global event handler
@@ -486,11 +513,15 @@ function Translator(props) {
   // On 'agreeAll', enable ALL settings required for translation
   // ---------------------------------------------------------------------------
   function agreeAll() {
-    var translationSettings = gatherOptions(true);
-    var consentSettings     = {};
+    var consentSettings     = JSON.parse(Cookie.get(self.props.cookieConsentName));
+    var translationSettings = {};
 
-    // enable and write all settings required for translation (consent cookie)
-    consentSettings                 = JSON.parse(Cookie.get(self.props.cookieConsentName));
+    // enable all settings required for translation
+    translationSettings.analysis = true;
+    translationSettings.personalization = true;
+    translationSettings.translationEnabled = true;
+
+    // overload user consent settings (consent cookie)
     consentSettings.analysis        = translationSettings.analysis;
     consentSettings.personalization = translationSettings.personalization;
 
@@ -498,17 +529,19 @@ function Translator(props) {
       self.props.cookieConsentName,
       JSON.stringify(consentSettings),
       self.props.cookieStorageDays,
-      self.props.sameSite,
-      self.props.secure
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
     );
 
-    // enable and write all settings required for translation (translation cookie)
+    // write all settings required for translation (translation cookie)
     Cookie.set(
       self.props.cookieName,
       JSON.stringify(translationSettings),
       self.props.cookieStorageDays,
-      self.props.sameSite,
-      self.props.secure
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
     );
 
     self.$modal.modal('hide');
@@ -519,15 +552,17 @@ function Translator(props) {
   // process current settings from checkboxes for button `doNotAgree`
   // ---------------------------------------------------------------------------
   function doNotAgree() {
-    var settings = gatherOptions();
+    var translationSettings = gatherOptions();
 
-    settings.translationEnabled = false;
+    // disable all settings required for translation (translation cookie)
+    translationSettings.translationEnabled = false;
     Cookie.set(
       self.props.cookieName,
-      JSON.stringify(settings),
+      JSON.stringify(translationSettings),
       self.props.cookieStorageDays,
-      self.props.sameSite,
-      self.props.secure
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
     );
     self.$modal.modal('hide');
   }
@@ -537,29 +572,29 @@ function Translator(props) {
   // write current settings from checkboxes to cookie
   // ---------------------------------------------------------------------------
   function saveSettings() {
-    var settings;
-    var consentSettings = {};
+    var translationSettings = gatherOptions();
+    var consentSettings     = JSON.parse(Cookie.get(self.props.cookieConsentName));
 
     // update all cookies required for (google-)translation
     //
-    settings                        = gatherOptions();
-    consentSettings                 = JSON.parse(Cookie.get(self.props.cookieConsentName));
-    consentSettings.analysis        = settings.analysis;
-    consentSettings.personalization = settings.personalization;
+    consentSettings.analysis        = translationSettings.analysis;
+    consentSettings.personalization = translationSettings.personalization;
 
     Cookie.set(
       self.props.cookieConsentName,
       JSON.stringify(consentSettings),
       self.props.cookieStorageDays,
-      self.props.sameSite,
-      self.props.secure
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
     );
     Cookie.set(
       self.props.cookieName,
-      JSON.stringify(gatherOptions()),
+      JSON.stringify(translationSettings),
       self.props.cookieStorageDays,
-      self.props.sameSite,
-      self.props.secure
+      self.props.cookieSameSite,
+      self.props.cookieDomain,
+      self.props.cookieSecure
     );
     self.$modal.modal('hide');
   }