j1-template 2021.1.12 → 2021.1.17

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

@@ -127,8 +127,8 @@ j1.adapter['toccer'] = (function () {
 
       // initialize state flag
       _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('Module is being initialized');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
 
       // create settings object from frontmatterOptions
       var frontmatterOptions = options != null ? $.extend({}, options) : {};
@@ -175,9 +175,9 @@ j1.adapter['toccer'] = (function () {
             _this.initToccerCore(settings);
             _this.setState('finished');
 
-            logger.info('state: ' + _this.getState());
-            logger.info('module initialized successfully');
-            logger.info('met dependencies for: j1');
+            logger.info('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module initialized successfully');
+            logger.info('\n' + 'met dependencies for: j1');
             clearInterval(dependencies_met_navigator);
           }
         }, 25);
@@ -219,7 +219,7 @@ j1.adapter['toccer'] = (function () {
       scrollOffset        = scrollOffset + moduleOptions.scrollSmoothOffset
 
       _this.setState('running');
-      logger.info('state: ' + _this.getState());
+      logger.info('\n' + 'state: ' + _this.getState());
 
       // tocbot get fired if HTML portion is loaded (AJAX load finished)
       //
@@ -256,7 +256,7 @@ j1.adapter['toccer'] = (function () {
             throttleTimeout:        moduleOptions.throttleTimeout
           });
           /* eslint-enable */
-          logger.info('met dependencies for: xhrData');
+          logger.info('\n' + 'met dependencies for: loadHTML');
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished
@@ -323,7 +323,7 @@ j1.adapter['toccer'] = (function () {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -333,7 +333,7 @@ j1.adapter['toccer'] = (function () {
         //
         // Place handling of command|action here
         //
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //

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

@@ -861,12 +861,12 @@
 
           // jadams, 2017-12-07: Added log for testing
           if(this.options.debug) {
-            logText = 'resize: boxHeight x boxWidth: ' + boxHeight + ' x ' + boxWidth;
+            logText = '\n' + 'resize: boxHeight x boxWidth: ' + boxHeight + ' x ' + boxWidth;
             logger.debug(logText);
           }
 
           if ( boxHeight == 0 || boxWidth == 0 ) {
-            logText = 'Kacke am Schuh';
+            logText = '\n' + 'Kacke am Schuh';
             logger.warn(logText);
           }
 
@@ -1083,7 +1083,7 @@
             if ($(myID).is(':visible')) {
               // clear interval checking
               clearInterval(isVisible);
-              logger.info('container visible on id: ' + myID);
+              logger.info('\n' + 'container visible on id: ' + myID);
               that.resize();
             }
           }, 50); // END 'isVisible'

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

@@ -38,16 +38,18 @@
 // -----------------------------------------------------------------------------
 
 function BootstrapCookieConsent(props) {
+  var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
+  var modalId               = 'bccs-modal';
+  var self                  = this;
+  var detailedSettingsShown = false;
+  var url                   = new liteURL(window.location.href);
+  var secure                = (url.protocol.includes('https')) ? true : false;
   var logText;
   var current_page;
   var whitelisted;
-  var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
-  var modalId               = "bccs-modal"
-  var self                  = this
-  var detailedSettingsShown = false
 
-  logger.info('Initializing core module: started');
-  logger.info('state: started');
+  logger.info('\n' + 'initializing core module: started');
+  logger.info('\n' + 'state: started');
 
   this.props = {
     autoShowDialog:         true,                                               // disable autoShowModal on the privacy policy and legal notice pages, to make these pages readable
@@ -59,7 +61,8 @@ function BootstrapCookieConsent(props) {
     postSelectionCallback:  undefined,                                          // callback function, called after the user has made his selection
     whitelisted:            [],                                                 // pages NO consent modal page is issued
     xhr_data_element:       "",                                                 // container for the language-specific consent modal taken from /assets/data/cookieconsent.html
-    sameSite:               "Strict"                                            // restrict consent cookie to first-party, do NOT send cookie to other domains
+    sameSite:               "Strict",                                           // restrict consent cookie to first-party, do NOT send cookie to other domains
+    secure:                 false                                               //
   }
 
   for (var property in props) {
@@ -76,7 +79,7 @@ function BootstrapCookieConsent(props) {
   }
 
   var Cookie = {
-    set: function (name, value, days, samesite) {
+    set: function (name, value, days, samesite, secure) {
       var value_encoded = window.btoa(value);
       var expires = "";
       if (days) {
@@ -84,7 +87,11 @@ function BootstrapCookieConsent(props) {
         date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
         expires = "; expires=" + date.toUTCString();
       }
-      document.cookie = name + "=" + (value_encoded || '') + expires + '; Path=/; SameSite=' + samesite + ';';
+      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 + "=";
@@ -119,7 +126,7 @@ function BootstrapCookieConsent(props) {
 
       self.modal = document.getElementById(modalId);
       if (!self.modal) {
-        logger.info('Load consent modal');
+        logger.info('\n' +  'load consent modal');
         self.modal = document.createElement("div");
         self.modal.id = modalId;
         self.modal.setAttribute("class", "modal fade");
@@ -140,7 +147,7 @@ function BootstrapCookieConsent(props) {
         var templateUrl = self.props.contentURL + '/' + 'index.html';
         $.get(templateUrl)
         .done(function (data) {
-          logger.info('Loading Consent modal: successfully');
+          logger.info('\n' + 'loading consent modal: successfully');
           self.modal.innerHTML = data;
           self.modal.innerHTML = $('#' + self.props.xhr_data_element).eq(0).html();
 
@@ -154,7 +161,7 @@ function BootstrapCookieConsent(props) {
           self.$buttonSave = $("#bccs-buttonSave");
           self.$buttonAgreeAll = $("#bccs-buttonAgreeAll");
 
-          logger.info('Load/Initialze options from cookie');
+          logger.info('\n' + 'load/initialze options from cookie');
 
           updateButtons();
           updateOptionsFromCookie();
@@ -167,7 +174,7 @@ function BootstrapCookieConsent(props) {
             updateButtons();
           });
 
-          logger.info('Initialze event handler');
+          logger.info('\n' + 'initialze event handler');
 
           self.$buttonDoNotAgree.click(function () {
             doNotAgree();
@@ -187,8 +194,8 @@ function BootstrapCookieConsent(props) {
           });
         })
         .fail(function () {
-          logger.error('Loading Consent modal: failed');
-          logger.info('Probably no `contentURL` set');
+          logger.error('\n' + 'loading consent modal: failed');
+          logger.warn('\n' + 'probably no `contentURL` set');
         })
       } else {
         self.$modal.modal("show")
@@ -239,12 +246,12 @@ function BootstrapCookieConsent(props) {
   }
 
   function agreeAll() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.sameSite);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.sameSite, self.props.secure);
     self.$modal.modal("hide");
   }
 
   function doNotAgree() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.sameSite);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.sameSite, self.props.secure);
 
     // jadams, 2021-07-15: all cookies NOT longer supported by j1.expireCookie
     // TODO: Create loop over all cookies found in page
@@ -257,7 +264,7 @@ function BootstrapCookieConsent(props) {
   }
 
   function saveSettings() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.sameSite);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.sameSite, self.props.secure);
     self.$modal.modal("hide");
   }
 
@@ -271,8 +278,8 @@ function BootstrapCookieConsent(props) {
   // API functions
   // ---------------------------------------------------------------------------
 
-  logger.info('Initializing core module finished');
-  logger.info('state: finished');
+  logger.info('\n' + 'initializing core module finished');
+  logger.info('\n' + 'state: finished');
 
   // show the consent dialog (modal)
   // ---------------------------------------------------------------------------

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

@@ -1,6 +1,6 @@
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js
+ # ~/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js
  # Provides JS Core for J1 Module BS Cookie Consent
  #
  #  Product/Info:
@@ -24,4 +24,4 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-"use strict";function BootstrapCookieConsent(c){var g;var e;var q;var r=log4javascript.getLogger("j1.core.bsCookieConsent");var p="bccs-modal";var l=this;var n=false;r.info("Initializing core module: started");r.info("state: started");this.props={autoShowDialog:true,language:navigator.language,languages:["en","de"],contentURL:"./content",cookieName:"cookie-consent-settings",cookieStorageDays:365,postSelectionCallback:undefined,whitelisted:[],xhr_data_element:""};for(var d in c){this.props[d]=c[d]}this.language=this.props.language;if(this.language.indexOf("-")!==-1){this.language=this.language.split("-")[0]}if(!this.props.languages.includes(this.language)){this.language=this.props.languages[0]}var f={set:function(u,v,x){var w=window.btoa(v);var s="";if(x){var t=new Date();t.setTime(t.getTime()+(x*24*60*60*1000));s="; expires="+t.toUTCString()}document.cookie=u+"="+(w||"")+s+"; Path=/; SameSite=Strict;"},get:function(t){var w=t+"=";var s=document.cookie.split(";");for(var u=0;u<s.length;u++){var y=s[u];while(y.charAt(0)===" "){y=y.substring(1,y.length)}if(y.indexOf(w)===0){var x=y.substring(w.length,y.length);var v=window.atob(x);return v}}return undefined}};var k={documentReady:function(s){if(document.readyState!=="loading"){s()}else{document.addEventListener("DOMContentLoaded",s)}}};function j(s){k.documentReady(function(){l.modal=document.getElementById(p);if(!l.modal){r.info("Load consent modal");l.modal=document.createElement("div");l.modal.id=p;l.modal.setAttribute("class","modal fade");l.modal.setAttribute("tabindex","-1");l.modal.setAttribute("role","dialog");l.modal.setAttribute("aria-labelledby",p);document.body.append(l.modal);l.$modal=$(l.modal);if(l.props.postSelectionCallback){l.$modal.on("hidden.bs.modal",function(){l.props.postSelectionCallback()})}var t=l.props.contentURL+"/index.html";$.get(t).done(function(u){r.info("Loading Consent modal: successfully");l.modal.innerHTML=u;l.modal.innerHTML=$("#"+l.props.xhr_data_element).eq(0).html();$(l.modal).modal({backdrop:"static",keyboard:false});l.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");l.$buttonAgree=$("#bccs-buttonAgree");l.$buttonSave=$("#bccs-buttonSave");l.$buttonAgreeAll=$("#bccs-buttonAgreeAll");r.info("Load/Initialze options from cookie");i();h();$("#bccs-options").on("hide.bs.collapse",function(){n=false;i()}).on("show.bs.collapse",function(){n=true;i()});r.info("Initialze event handler");l.$buttonDoNotAgree.click(function(){b()});l.$buttonAgree.click(function(){m()});l.$buttonSave.click(function(){$("#bccs-options").collapse("hide");o();h()});l.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");m();h()})}).fail(function(){r.error("Loading Consent modal: failed");r.info("Probably no `contentURL` set")})}else{l.$modal.modal("show")}}.bind(this))}function h(){var u=l.getSettings();if(u){for(var t in u){var s=l.$modal.find("#bccs-options .bccs-option[data-name='"+t+"'] input[type='checkbox']");s.prop("checked",u[t])}}}function i(){if(n){l.$buttonDoNotAgree.hide();l.$buttonAgree.hide();l.$buttonSave.show();l.$buttonAgreeAll.show()}else{l.$buttonDoNotAgree.show();l.$buttonAgree.show();l.$buttonSave.hide();l.$buttonAgreeAll.hide()}}function a(t){var s=l.$modal.find("#bccs-options .bccs-option");var v={};for(var w=0;w<s.length;w++){var y=s[w];var u=y.getAttribute("data-name");if(u==="necessary"){v[u]=true}else{if(t===undefined){var x=$(y).find("input[type='checkbox']");v[u]=x.prop("checked")}else{v[u]=!!t}}}return v}function m(){f.set(l.props.cookieName,JSON.stringify(a(true)),l.props.cookieStorageDays);l.$modal.modal("hide")}function b(){f.set(l.props.cookieName,JSON.stringify(a(false)),l.props.cookieStorageDays);r.warn("delete cookie: j1.user.consent");j1.deleteCookie("all");l.$modal.modal("hide");j1.goHome()}function o(){f.set(l.props.cookieName,JSON.stringify(a()),l.props.cookieStorageDays);l.$modal.modal("hide")}q=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(f.get(this.props.cookieName)===undefined&&this.props.autoShowDialog&&!q){j()}r.info("Initializing core module finished");r.info("state: finished");this.showDialog=function(){q=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!q){j()}};this.getSettings=function(t){var s=f.get(l.props.cookieName);if(s){var u=JSON.parse(f.get(l.props.cookieName));if(t===undefined){return u}else{if(u){return u[t]}else{return false}}}else{return undefined}}};
+function BootstrapCookieConsent(c){var t=log4javascript.getLogger("j1.core.bsCookieConsent");var r="bccs-modal";var o=this;var p=false;var d=new liteURL(window.location.href);var m=(d.protocol.includes("https"))?true:false;var h;var f;var s;t.info("\ninitializing core module: started");t.info("\nstate: started");this.props={autoShowDialog:true,language:navigator.language,languages:["en","de"],contentURL:"./content",cookieName:"cookie-consent-settings",cookieStorageDays:365,postSelectionCallback:undefined,whitelisted:[],xhr_data_element:"",sameSite:"Strict",secure:false};for(var e in c){this.props[e]=c[e]}this.language=this.props.language;if(this.language.indexOf("-")!==-1){this.language=this.language.split("-")[0]}if(!this.props.languages.includes(this.language)){this.language=this.props.languages[0]}var g={set:function(w,y,B,x,z){var A=window.btoa(y);var u="";if(B){var v=new Date();v.setTime(v.getTime()+(B*24*60*60*1000));u="; expires="+v.toUTCString()}if(z){document.cookie=w+"="+(A||"")+u+"; Path=/; SameSite="+x+"; secure="+z+";"}else{document.cookie=w+"="+(A||"")+u+"; Path=/; SameSite="+x+";"}},get:function(v){var y=v+"=";var u=document.cookie.split(";");for(var w=0;w<u.length;w++){var A=u[w];while(A.charAt(0)===" "){A=A.substring(1,A.length)}if(A.indexOf(y)===0){var z=A.substring(y.length,A.length);var x=window.atob(z);return x}}return undefined}};var l={documentReady:function(u){if(document.readyState!=="loading"){u()}else{document.addEventListener("DOMContentLoaded",u)}}};function k(u){l.documentReady(function(){o.modal=document.getElementById(r);if(!o.modal){t.info("\nload consent modal");o.modal=document.createElement("div");o.modal.id=r;o.modal.setAttribute("class","modal fade");o.modal.setAttribute("tabindex","-1");o.modal.setAttribute("role","dialog");o.modal.setAttribute("aria-labelledby",r);document.body.append(o.modal);o.$modal=$(o.modal);if(o.props.postSelectionCallback){o.$modal.on("hidden.bs.modal",function(){o.props.postSelectionCallback()})}var v=o.props.contentURL+"/index.html";$.get(v).done(function(w){t.info("\nloading consent modal: successfully");o.modal.innerHTML=w;o.modal.innerHTML=$("#"+o.props.xhr_data_element).eq(0).html();$(o.modal).modal({backdrop:"static",keyboard:false});o.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");o.$buttonAgree=$("#bccs-buttonAgree");o.$buttonSave=$("#bccs-buttonSave");o.$buttonAgreeAll=$("#bccs-buttonAgreeAll");t.info("\nload/initialze options from cookie");j();i();$("#bccs-options").on("hide.bs.collapse",function(){p=false;j()}).on("show.bs.collapse",function(){p=true;j()});t.info("\ninitialze event handler");o.$buttonDoNotAgree.click(function(){b()});o.$buttonAgree.click(function(){n()});o.$buttonSave.click(function(){$("#bccs-options").collapse("hide");q();i()});o.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");n();i()})}).fail(function(){t.error("\nloading consent modal: failed");t.warn("\nprobably no `contentURL` set")})}else{o.$modal.modal("show")}}.bind(this))}function i(){var w=o.getSettings();if(w){for(var v in w){var u=o.$modal.find("#bccs-options .bccs-option[data-name='"+v+"'] input[type='checkbox']");u.prop("checked",w[v])}}}function j(){if(p){o.$buttonDoNotAgree.hide();o.$buttonAgree.hide();o.$buttonSave.show();o.$buttonAgreeAll.show()}else{o.$buttonDoNotAgree.show();o.$buttonAgree.show();o.$buttonSave.hide();o.$buttonAgreeAll.hide()}}function a(v){var u=o.$modal.find("#bccs-options .bccs-option");var x={};for(var y=0;y<u.length;y++){var A=u[y];var w=A.getAttribute("data-name");if(w==="necessary"){x[w]=true}else{if(v===undefined){var z=$(A).find("input[type='checkbox']");x[w]=z.prop("checked")}else{x[w]=!!v}}}return x}function n(){g.set(o.props.cookieName,JSON.stringify(a(true)),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide")}function b(){g.set(o.props.cookieName,JSON.stringify(a(false)),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide");j1.goHome()}function q(){g.set(o.props.cookieName,JSON.stringify(a()),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide")}s=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(g.get(this.props.cookieName)===undefined&&this.props.autoShowDialog&&!s){k()}t.info("\ninitializing core module finished");t.info("\nstate: finished");this.showDialog=function(){s=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!s){k()}};this.getSettings=function(v){var u=g.get(o.props.cookieName);if(u){var w=JSON.parse(g.get(o.props.cookieName));if(v===undefined){return w}else{if(w){return w[v]}else{return false}}}else{return undefined}}};

data/assets/themes/j1/modules/lunrSearch/js/quicksearch.js

@@ -154,7 +154,7 @@
       //
       if (docs.length > 0) {
         var logger =    log4javascript.getLogger("j1.searcher");
-        var log_text =  'cleanup tags and categories';
+        var log_text =  '\n' + 'cleanup tags and categories';
         logger.info(log_text);
         $('.sr-tags').each(function() {
           var sr_tags = $(this).html().replace(/^\s+(.*)(\s+·\s+$)/, "$1");

data/assets/themes/j1/modules/themeSwitcher/js/switcher.js

@@ -47,16 +47,21 @@
 
   var old = $.fn.bootstrapThemeSwitcher;
 
-  var cookie_names              = j1.getCookieNames();
-  const user_state_cookie_name  = cookie_names.user_state;
+  var cookie_names      = j1.getCookieNames();
+  var gaCookies         = j1.findCookie('_ga');
+  var j1Cookies         = j1.findCookie('j1');
+  var url               = new liteURL(window.location.href);
+  var hostname          = url.hostname;
+  var domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+  var secure            = (url.protocol.includes('https')) ? true : false;
 
   var logger = log4javascript.getLogger('j1.core.switcher');
   var logText;
 
   var user_state_detected;
-  var j1_user_state = {};
-  var j1_user_state_json;
-  var j1_user_state_cookie;
+  var user_state = {};
+  var user_state_json;
+  var user_state_cookie;
 
   // Constructor
   // ---------------------------------------------------------------------------
@@ -75,13 +80,13 @@
   // ---------------------------------------------------------------------------
   BootstrapThemeSwitcher.prototype = {
     clear: function () {
-      logger.debug('bootstrapThemeSwitcher.clear');
+      logger.debug('\n' + 'bootstrapThemeSwitcher.clear');
       return this.$element.each(function () {
         this.$element.empty();
       });
     },
     update: function () {
-      logger.debug('bootstrapThemeSwitcher.update');
+      logger.debug('\n' + 'bootstrapThemeSwitcher.update');
       this.getThemes();
     },
 
@@ -112,27 +117,29 @@
     // -------------------------------------------------------------------------
     switchTheme: function (name, cssFile) {
 
-      var $this             = $(this);
-      var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var $this      = $(this);
+      var settings   = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+      var id         = settings.cssThemeLink;
+      var debug      = settings.debug;
+      var includeCSS = this.settings.includeBootswatch;
       var themeName;
       var theme_css;
-      var theme_extension_css;
-
-      var id                = settings.cssThemeLink;
-      var debug             = settings.debug;
-      var includeCSS        = this.settings.includeBootswatch;
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
       if ( user_state_detected ) {
-        logger.debug('cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.debug('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      themeName           = j1_user_state.theme_name;
-      theme_css           = j1_user_state.theme_css;
+      themeName = user_state.theme_name;
+      theme_css = user_state.theme_css;
 
       if (typeof cssFile === 'undefined') { cssFile = this.settings.defaultCssFile; }
       if (typeof name === 'undefined') { name = cssFile; }
@@ -141,32 +148,36 @@
       if (settings.saveToCookie) {
         if ( typeof Cookies === 'undefined' ) {
           if ( debug === 'true' ) {
-            logger.error('cookies library not present');
+            logger.error('\n' + 'cookies library not present');
           }
           return false;
         }
 
-        j1_user_state.theme_name  = name;
-        j1_user_state.theme_css   = cssFile;
+        user_state.theme_name  = name;
+        user_state.theme_css   = cssFile;
 
-        if (!(j1_user_state.theme_name.includes('Uno') || j1_user_state.theme_name == 'Bootstrap')) {
-          j1_user_state.theme_author        = 'Bootswatch';
-          j1_user_state.theme_author_url    = 'https://bootswatch.com/';
+        if (!(user_state.theme_name.includes('Uno') || user_state.theme_name == 'Bootstrap')) {
+          user_state.theme_author        = 'Bootswatch';
+          user_state.theme_author_url    = 'https://bootswatch.com/';
         } else {
-          j1_user_state.theme_author        = 'J1 Team';
-          j1_user_state.theme_author_url    = 'https://jekyll.one/';
+          user_state.theme_author        = 'J1 Team';
+          user_state.theme_author_url    = 'https://jekyll.one/';
         }
 
+        logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
         j1.writeCookie({
-          name: user_state_cookie_name,
-          data: j1_user_state
+          name: cookie_names.user_state,
+          data: user_state,
+          samesite: 'Strict',
+          secure:   secure,
+          expires:  365
         });
 
         // reload current page (skip cache)
         location.reload(true);
       } else {
-        logger.warn('write to cookie : disabled');
-        logger.warn('selected theme not activated: ' + name);
+        logger.debug('\n' + 'write to cookie : disabled');
+        logger.warn('\n' + 'selected theme not activated: ' + name);
       } // END if saveToCookie
 
     }, // END switchTheme
@@ -177,24 +188,28 @@
     loadThemeFromCookie: function (options) {
 
       if ( typeof Cookies === 'undefined' ) {
-        logger.error('cookies library not present');
+        logger.error('\n' + 'cookies library not present');
         return false;
       }
 
       var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, options);
 
       // detect|set user state cookie
-      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      user_state_detected = j1.existsCookie (cookie_names.user_state);
 
       if ( user_state_detected ) {
-        logger.info('cookie found: j1.user.state');
-        j1_user_state = j1.readCookie(user_state_cookie_name);
+        logger.info('\n' + 'cookie found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
       } else {
-        logger.error('cookie not found: j1.user.state');
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+        j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+        logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+        gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
       }
 
-      var themeName = j1_user_state.theme_name;
-      var themeCss  = j1_user_state.theme_css;
+      var themeName = user_state.theme_name;
+      var themeCss  = user_state.theme_css;
       this.switchTheme(themeName, themeCss);
 
     }, // END loadThemeFromCookie
@@ -214,11 +229,11 @@
     // -------------------------------------------------------------------------
     addThemesToControl: function() {
       if (typeof this.$element === 'undefined') {
-        logger.error('bootstrapThemeSelector|addThemesToControl: Element is undefined');
+        logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Element is undefined');
         return false;
       }
       if (typeof this.themesList === 'undefined') {
-        logger.error('bootstrapThemeSelector|addThemesToControl: Themes is undefined');
+        logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Themes is undefined');
         return false;
       }
 
@@ -247,25 +262,29 @@
       var base = this;
 
       if (this.$element.is('ul')) {
-        var $this             = $(this);
-        var settings          = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
-        var id                = settings.cssThemeLink;
+        var $this    = $(this);
+        var settings = $.extend({}, $.fn.bootstrapThemeSwitcher.defaults, $this.data('bootstrapThemeSwitcher'));
+        var id       = settings.cssThemeLink;
+        var debug    = settings.debug;
         var themeName;
-        var debug             = settings.debug;
 
         // detect|set user state cookie
-        user_state_detected = j1.existsCookie ( 'j1.user.state' );
+        user_state_detected = j1.existsCookie (cookie_names.user_state);
         if ( user_state_detected ) {
-          logger.debug('User state cookie found');
-          j1_user_state = j1.readCookie(user_state_cookie_name);
+          logger.debug('\n' + 'user state cookie found');
+          user_state = j1.readCookie(cookie_names.user_state);
         } else {
-          logger.error('User state NOT cookie found');
+          logger.error('\n' + 'user state NOT cookie found');
+          logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+          j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+          logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+          gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
         }
 
-        themeName = j1_user_state.theme_name;
+        themeName = user_state.theme_name;
 
         if ( debug === 'true' ) {
-          logger.debug('bootstrapThemeSelector: UL element selected');
+          logger.debug('\n' + 'bootstrapThemeSelector: UL element selected');
         }
         this.$element.empty();
 
@@ -305,7 +324,7 @@
         });
 
       } else if (this.$element.is('select')) {
-        logger.debug('bootstrapThemeSelector: SELECT element selected');
+        logger.debug('\n' + 'bootstrapThemeSelector: SELECT element selected');
         this.$element.empty();
 
         var optionSelectedMarker;
@@ -327,8 +346,8 @@
 
       } else {
         // no container found to add Theme list
-        logger.info('bootstrapThemeSelector: no UL or SELECT element found');
-        logger.error('bootstrapThemeSelector: failed');
+        logger.info('\n' + 'bootstrapThemeSelector: no UL or SELECT element found');
+        logger.error('\n' + 'bootstrapThemeSelector: failed');
         // console.warn('bootstrapThemeSelector only works with ul or select elements');
       }
     }, // END addThemesToControl
@@ -351,7 +370,7 @@
             base.addThemesToControl();
           },
           error: function (jqXHR, textStatus, errorThrown) {
-            logger.error('Failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
+            logger.error('\n' + 'failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
           }
         });
       } else {