j1-template 2021.1.9 → 2021.1.13

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

@@ -41,9 +41,9 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
+{% assign template_config         = site.data.j1_config %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -56,6 +56,8 @@ regenerate:                             true
 {% assign toccer_settings         = modules.toccer.settings %}
 {% assign themer_defaults         = modules.defaults.themer.defaults %}
 {% assign themer_settings         = modules.themer.settings %}
+{% assign tracking_enabled        = template_config.analytics.enabled %}
+{% assign tracking_id             = template_config.analytics.google.tracking_id %}
 
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
@@ -73,6 +75,23 @@ regenerate:                             true
 {% assign panel_data_path         = panel_config_defaults.data_path %}
 
 {% assign hideOnReload            = modules.themer_options.hideOnReload %}
+{% assign comment_provider        = template_config.comments.provider %}
+
+{% comment %} Set variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if comment_provider == 'disqus' %}
+  {% assign site_id = template_config.comments.disqus.site_id %}
+{% elsif comment_provider == 'hyvor' %}
+  {% assign site_id = template_config.comments.hyvor.site_id %}
+{% elsif comment_provider == 'commento' %}
+  {% assign site_id = template_config.comments.commento.site_id %}
+{% elsif comment_provider == 'just-comments' %}
+  {% assign site_id = template_config.comments.just-comments.site_id %}
+{% elsif comment_provider == 'facebook' %}
+  {% assign site_id = template_config.comments.facebook.site_id %}
+{% else %}
+  {% assign site_id = false %}
+{% endif %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -122,6 +141,18 @@ var j1 = (function () {
   var state                     = 'not_started';
   var mode                      = 'not_detected';
 
+  // Default tracking provider information
+  var tracking_enabled          = ('{{tracking_enabled}}' === 'true') ? true: false;
+  var tracking_id               = '{{tracking_id}}';
+  var tracking_id_valid         = (tracking_id.includes('tracking-id')) ? false : true;
+
+  // Default comment provider information
+  var comment_provider          = '{{comment_provider}}';
+  var site_id                   = '{{site_id}}';
+
+  // Default translator settings (currently NOT supported)
+  // var translation_enabled       = {{template_config.translation.enabled}};
+
   var current_user_data;
   var current_page;
   var previous_page;
@@ -129,9 +160,7 @@ var j1 = (function () {
   var last_pager_url;
   var app_detected;
   var user_session_detected;
-
-  // Translatior settings (currently NOT supported)
-  // var translation_enabled       = {{template_config.translation.enabled}};
+  var cookie_written;
 
   // Theme information
   var themeName;
@@ -157,17 +186,16 @@ var j1 = (function () {
   var baseUrl;
   var referrer;
 
+  // initial cookie settings
   var cookie_names = {
     'app_session':  '{{template_config.cookies.app_session}}',
     'user_session': '{{template_config.cookies.user_session}}',
     'user_state':   '{{template_config.cookies.user_state}}',
     'user_consent': '{{template_config.cookies.user_consent}}'
   };
-
-  // user SESSION cookie (initial values)
   var user_session = {
     'mode':                 'web',
-    'writer':               'web',
+    'writer':               'j1.adapter',
     'locale':               navigator.language || navigator.userLanguage,
     'user_name':            '{{template_config.user.user_name}}',
     'provider':             '{{template_config.user.provider}}',
@@ -182,17 +210,17 @@ var j1 = (function () {
     'previous_page':        'na',
     'last_pager':           '/pages/public/blog/navigator/'
   };
-
   var user_state = {
+    'writer':               'j1.adapter',
+    'theme_css':            '',
     'theme_css':            '',
     'theme_name':           '',
     'theme_author':         '',
-    'theme_version':        '{{site.version}}',
+    'theme_version':        '{{template_version}}',
     'session_active':       false,
     'last_session_ts':      ''
   };
-
-  var user_consent;
+  var user_consent = {};
 
   // ---------------------------------------------------------------------------
   // helper functions
@@ -223,12 +251,15 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       // global var (function)
       // -----------------------------------------------------------------------
-      var logger        = log4javascript.getLogger('j1.init');
-      var url           = new liteURL(window.location.href);
-      var baseUrl       = url.origin;
-      var date          = new Date();
-      var timestamp_now = date.toISOString();
-      var curr_state    = 'started';
+      var logger            = log4javascript.getLogger('j1.init');
+      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 secure            = (url.protocol.includes('https')) ? true : false;
+      var date              = new Date();
+      var timestamp_now     = date.toISOString();
+      var curr_state        = 'started';
 
       // -----------------------------------------------------------------------
       // options loader
@@ -262,30 +293,49 @@ var j1 = (function () {
         var url;
         var baseUrl;
 
-        user_state.session_active     = false;
-        user_state.last_session_ts    = timestamp_now;
-
-        if (!user_consent.analyses || !user_consent.personalization)  {
-          // expire consent|state cookies to session
-          j1.writeCookie({
-            name:     cookie_names.user_consent,
-            data:     user_state,
-            samesite: 'Strict'
-          });
-          j1.writeCookie({
-            name:     cookie_names.user_state,
-            data:     user_state,
-            samesite: 'Strict'
-          });
+        // final update of the user state cookie before browser page|tab
+        // get closed
+        if (user_state) {
+          user_state.session_active     = false;
+          user_state.last_session_ts    = timestamp_now;
+
+          if (!user_consent.analyses || !user_consent.personalization)  {
+            // expire consent|state cookies to session
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_consent,
+              data:     user_consent,
+              samesite: 'Strict',
+              secure:   secure
+            });
+            if (!cookie_written) {
+              logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+            }
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_state,
+              data:     user_state,
+              samesite: 'Strict',
+              secure:   secure
+            });
+            if (!cookie_written) {
+            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+            }
+          } else {
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_state,
+              data:     user_state,
+              samesite: 'Strict',
+              secure:   secure,
+              expires:  365
+            });
+            if (!cookie_written) {
+            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+            }
+          }
         } else {
-          j1.writeCookie({
-            name:     cookie_names.user_state,
-            data:     user_state,
-            samesite: 'Strict',
-            expires:  365
-          });
+          // jadams, 2021-07-11: on beforeunload, a vaild state cookie
+          // is expected
+          logger.fatal('\n' + 'missing cookie detected: ' + cookie_names.user_state);
         }
-
       }); // END beforeunload
 
       // -----------------------------------------------------------------------
@@ -297,37 +347,61 @@ var j1 = (function () {
       user_consent  = j1.readCookie(cookie_names.user_consent);
       user_session  =  j1.existsCookie(cookie_names.user_session)
                         ? j1.readCookie(cookie_names.user_session)
-                        : j1.writeCookie({
+                        : cookie_written = j1.writeCookie({
                             name:     cookie_names.user_session,
                             data:     user_session,
-                            samesite: 'Strict'
+                            samesite: 'Strict',
+                            secure:   secure
                           });
+      if (!cookie_written) {
+      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+      }
 
       user_state    =  j1.existsCookie(cookie_names.user_state)
                         ? j1.readCookie(cookie_names.user_state)
-                        : j1.writeCookie({
+                        : cookie_written = j1.writeCookie({
                             name:     cookie_names.user_state,
                             data:     user_state,
                             samesite: 'Strict',
+                            secure:   secure,
                             expires:  365
                           });
+      if (!cookie_written) {
+      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+      }
 
-      user_state.session_active = true;
+      // jadams, 2021-07-11: Found situation that user_state NOT initialized
+      // correctly (user_state == false).
+      // TODO: Check if/why user state (cookie NOT created?) NOT initialized
+      // for what reason.
+      if (!user_state) {
+        logger.error('\n' + 'cookie not found: ' + cookie_names.user_state);
+        user_state = j1.readCookie(cookie_names.user_state);
+        user_state.session_active = true;
+      }
 
       if (!user_consent.analyses || !user_consent.personalization)  {
         // expire consent|state cookies to session
-        j1.writeCookie({
+        cookie_written = j1.writeCookie({
           name:     cookie_names.user_state,
           data:     user_state,
-          samesite: 'Strict'
+          samesite: 'Strict',
+          secure:   secure
         });
+        if (!cookie_written) {
+        	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+        }
       } else {
-        j1.writeCookie({
+        cookie_written = j1.writeCookie({
           name:     cookie_names.user_state,
           data:     user_state,
           samesite: 'Strict',
+          secure:   secure,
           expires:  365
         });
+        if (!cookie_written) {
+        	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+        }
       }
 
       // detect middleware (mode 'app') and update user session cookie
@@ -350,35 +424,41 @@ var j1 = (function () {
           user_session.requested_page = window.location.pathname;
           user_session.timestamp      = timestamp_now;
           user_session                = j1.mergeData(user_session, data);
-          logText                     = 'mode detected: ' + user_session.mode;
+          logText                     = '\n' + 'mode detected: ' + user_session.mode;
 
           logger.info(logText);
-          logger.info('update user session cookie');
-          j1.writeCookie({
+          logger.info('\n' + 'update user session cookie');
+          cookie_written = j1.writeCookie({
             name:     cookie_names.user_session,
             data:     user_session,
-            samesite: 'Strict'
+            samesite: 'Strict',
+            secure:   secure
           });
+
+          if (!cookie_written) {
+          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+          }
+
           j1.setState(curr_state);
-          logger.info('state: ' + j1.getState());
+          logger.info('\n' + 'state: ' + j1.getState());
 
           var dependencies_met_page_displayed = setInterval (function () {
             if (j1.getState() == 'finished') {
               if (j1.authEnabled()) {
                 if (user_session.authenticated === 'true') {
                   // set signout
-                  logger.info('show signout icon');
+                  logger.info('\n' + 'show signout icon');
                   $('#navLinkSignInOut').attr('data-target','#modalOmniSignOut');
                   $('#iconSignInOut').removeClass('mdi-login').addClass('mdi-logout');
                 } else {
                   // set signin
-                  logger.info('show signin icon');
+                  logger.info('\n' + 'show signin icon');
                   $('#navLinkSignInOut').attr('data-target','#modalOmniSignIn');
                   $('#iconSignInOut').removeClass('mdi-logout').addClass('mdi-login');
                 }
-                logger.info('authentication detected as: ' + user_session.authenticated);
+                logger.info('\n' + 'authentication detected as: ' + user_session.authenticated);
                 $('#quickLinksSignInOutButton').css('display', 'block');
-                logger.info('met dependencies for: j1');
+                logger.info('\n' + 'met dependencies for: j1');
                 clearInterval(dependencies_met_page_displayed);
               }
             }
@@ -392,34 +472,39 @@ var j1 = (function () {
             user_session.mode           = 'web';
             user_session.requested_page = window.location.pathname;
             user_session.timestamp      = timestamp_now;
-            logText                     = 'mode detected: ' + user_session.mode;
+            logText                     = '\n' + 'mode detected: ' + user_session.mode;
 
             logger.info(logText);
-            j1.writeCookie({
+            cookie_written = j1.writeCookie({
               name:     cookie_names.user_session,
               data:     user_session,
-              samesite: 'Strict'
+              samesite: 'Strict',
+              secure:   secure
             });
+            if (!cookie_written) {
+            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+            }
+
             j1.setState(curr_state);
-            logger.info('state: ' + j1.getState());
+            logger.info('\n' + 'state: ' + j1.getState());
           }, detectTimeout);
         });
-      } else { // app mode
+      } else { // web mode
         state = 'started';
-        logger.info('state: ' + state);
-        logger.info('page is being initialized');
+        logger.info('\n' + 'state: ' + state);
+        logger.info('\n' + 'page is being initialized');
       }
 
       state = 'started';
-      logger.info('state: ' + state);
-      logger.info('page is being initialized');
+      logger.info('\n' + 'state: ' + state);
+      logger.info('\n' + 'page is being initialized');
 
       if ( settings.scrollbar === 'false'  ) {
         $('body').addClass('hide-scrollbar');
         $('html').addClass('hide-scrollbar-moz');
       }
 
-      logger.info('read user state from cookie');
+      logger.info('\n' + 'read user state from cookie');
       user_session = j1.readCookie(cookie_names.user_session);
 
       // process|update user state cookie
@@ -449,13 +534,18 @@ var j1 = (function () {
         last_pager                = user_session.last_pager;
       }
 
-      logger.info('update user session cookie');
-      j1.writeCookie({
+      logger.info('\n' + 'update user session cookie');
+      cookie_written = j1.writeCookie({
         name:     cookie_names.user_session,
         data:     user_session,
-        samesite: 'Strict'
+        samesite: 'Strict',
+        secure:   secure
       });
 
+      if (!cookie_written) {
+      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+      }
+
       // NOTE: asynchronous calls should be rewitten to xhrData
       // initialize page resources for blocks
       j1.initBanner(settings);
@@ -463,15 +553,19 @@ var j1 = (function () {
       j1.initFooter(settings);
 
       state = 'running';
-      logger.info('state: ' + state);
-      logger.info(logText);
+      logger.info('\n' + 'state: ' + state);
+      // logger.info(logText);
 
       user_session.timestamp = timestamp_now;
-      j1.writeCookie({
+      cookie_written = j1.writeCookie({
         name:     cookie_names.user_session,
         data:     user_session,
-        samesite: 'Strict'
+        samesite: 'Strict',
+        secure:   secure
       });
+      if (!cookie_written) {
+      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+      }
 
       // -----------------------------------------------------------------------
       // additional BS helpers from j1.core
@@ -502,20 +596,20 @@ var j1 = (function () {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt ==  'success' ) {
             var logger = log4javascript.getLogger('j1.adapter.xhrData');
-            logText = 'loading banner completed on id: ' +banner_id;
+            logText = '\n' + 'loading banner completed on id: ' +banner_id;
             logger.info(logText);
             j1.setXhrDataState(banner_id, statusTxt);
             j1.setXhrDomState(banner_id, statusTxt);
-            logger.info('XHR data loaded in the DOM: ' + banner_id);
+            logger.info('\n' + 'XHR data loaded in the DOM: ' + banner_id);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'loading banner failed on id: ' +banner_id+ ', error: ' + xhr.status + ': ' + xhr.statusText;
+            logText = '\n' + 'loading banner failed on id: ' +banner_id+ ', error: ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             j1.setXhrDataState(banner_id, statusTxt);
             j1.setXhrDomState(banner_id, statusTxt);
             // Set|Log status
             state = 'failed';
-            logger.error('state: ' + state);
+            logger.error('\n' + 'state: ' + state);
           }
         };
       };
@@ -576,15 +670,15 @@ var j1 = (function () {
           var id = '#' + banner[i];
           var selector = $(id);
           if (selector.length) {
-            logText = 'loading banner on id: ' +banner[i];
+            logText = '\n' + 'loading banner on id: ' +banner[i];
             logger.info(logText);
             var banner_data_path = '{{banner_data_path}} ' + id;
             selector.load(banner_data_path, cb_load_closure(id));
           }
         } // END for
       }  else {
-        logText = 'no banner found in site';
-        logger.info(logText);
+        logText = '\n' + 'no banner found in site';
+        logger.warn(logText);
         return false;
       }
       return true;
@@ -613,20 +707,20 @@ var j1 = (function () {
         return function ( responseTxt, statusTxt, xhr ) {
           var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt == 'success' ) {
-            logText = 'loading panel completed on id: ' +panel_id;
+            logText = '\n' + 'loading panel completed on id: ' +panel_id;
             logger.info(logText);
             j1.setXhrDataState(panel_id, statusTxt);
             j1.setXhrDomState(panel_id, statusTxt);
-            logger.info('XHR data loaded in the DOM: ' + panel_id);
+            logger.info('\n' + 'XHR data loaded in the DOM: ' + panel_id);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'loading panel failed on id: ' +panel_id+ ', error ' + xhr.status + ': ' + xhr.statusText;
+            logText = '\n' + 'loading panel failed on id: ' +panel_id+ ', error ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             j1.setXhrDataState(panel_id, statusTxt);
             j1.setXhrDomState(panel_id, statusTxt);
             // Set|Log status
             state = 'Error';
-            logger.error('state: ' + state);
+            logger.error('\n' + 'state: ' + state);
           }
         };
       };
@@ -679,15 +773,15 @@ var j1 = (function () {
           var id = '#' + panel[i];
           var selector = $(id);
           if ( selector.length ) {
-            logText = 'loading panel on id: ' +panel[i];
+            logText = '\n' + 'loading panel on id: ' +panel[i];
             logger.info(logText);
             var panel_data_path = '{{panel_data_path}} ' + id;
             selector.load(panel_data_path, cb_load_closure(id));
           }
         } // END for
       } else {
-        logText = 'no panel found in site';
-        logger.info(logText);
+        logText = '\n' + 'no panel found in site';
+        logger.warn(logText);
         return false;
       }
       return true;
@@ -702,31 +796,31 @@ var j1 = (function () {
       var mod               = 'j1';
       var logText;
 
-      logText = 'loading footer started';
+      logText = '\n' + 'loading footer started';
       logger.info(logText);
 
       var cb_load_closure = function(footer_id) {
         return function ( responseTxt, statusTxt, xhr ) {
           var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt ==  'success' ) {
-            logText = 'footer loaded successfully on id: ' + footer_id;
+            logText = '\n' + 'footer loaded successfully on id: ' + footer_id;
             logger.info(logText);
             j1.setXhrDataState(footer_id, statusTxt);
             j1.setXhrDomState(footer_id, statusTxt);
-            logger.info('XHR data loaded in the DOM: ' + footer_id);
-            logText = 'initialization finished';
+            logger.info('\n' + 'XHR data loaded in the DOM: ' + footer_id);
+            logText = '\n' + 'initialization finished';
             logger.info(logText);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'loading footer failed on id: ' +footer_id+ ', error ' + xhr.status + ': ' + xhr.statusText;
+            logText = '\n' + 'loading footer failed on id: ' +footer_id+ ', error ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             j1.setXhrDataState(footer_id, statusTxt);
             j1.setXhrDomState(footer_id, statusTxt);
 
             // Set|Log status
             state = 'failed';
-            logger.error('state: ' + state);
-            logText = 'initialization finished';
+            logger.error('\n' + 'state: ' + state);
+            logText = '\n' + 'initialization finished';
             logger.info(logText);
           }
         };
@@ -738,7 +832,7 @@ var j1 = (function () {
         var footer_data_path = '{{footer_data_path}} ' + id;
         selector.load(footer_data_path, cb_load_closure(id));
       } else {
-        logText = 'data not loaded';
+        logText = '\n' + 'data not loaded';
         logger.warn(logText);
         j1.setXhrDataState(id, 'not loaded');
         j1.setXhrDomState(id, 'pending');
@@ -762,9 +856,11 @@ var j1 = (function () {
       var flickerTimeout      = {{template_config.flicker_timeout}};
       var url                 = new liteURL(window.location.href);
       var baseUrl             = url.origin;
+      var secure              = (url.protocol.includes('https')) ? true : false;
       var ep_status           = baseUrl + '/status' + '?page=' + window.location.pathname;
       var user_session        = j1.readCookie(cookie_names.user_session);
       var user_state          = j1.readCookie(cookie_names.user_state);
+      var user_consent        = j1.readCookie(cookie_names.user_consent);
       var current_url         = new liteURL(window.location.href);
       var providerPermissions = {};
       var provider;
@@ -772,14 +868,36 @@ var j1 = (function () {
       var appDetected;
       var categoryAllowed;
 
-      logger.info('finalize page');
+      // provider APIs require user consent
+      var meta_analytics        = $('meta[name=analytics]').attr('content');
+      var analytics             = (meta_analytics === 'true') ? true: false;
+      var meta_comments         = $('meta[name=comments]').attr('content');
+      var comments              = (meta_comments === 'true') ? true: false;
+      var meta_advertising      = $('meta[name=advertising]').attr('content');
+      var advertising           = (meta_advertising === 'true') ? true: false;
+      var meta_youtube          = $('meta[name=youtube]').attr('content');
+      var youtube               = (meta_youtube === 'true') ? true: false;
+      var meta_vimeo            = $('meta[name=vimeo]').attr('content');
+      var vimeo                 = (meta_vimeo === 'true') ? true: false;
+
+      // personalized content require user consent
+      var meta_personalization  = $('meta[name=personalization]').attr('content');
+      var personalization       = (meta_personalization === 'true') ? true: false;
+
+      // if personalized content detected, page requires user consent
+      if (personalization && !user_consent.personalization) {
+        // redirect to error paged (blocked content)
+        window.location.href = "/444.html";
+      }
+
+      logger.info('\n' + 'finalize page');
       j1.setCss();
 
-      logText= 'loading page partials: started';
+      logText= '\n' + 'loading page partials: started';
       logger.info(logText);
 
       if (j1.appDetected()) { // app mode
-        logger.info('mode detected: app');
+        logger.info('\n' + 'mode detected: app');
 
         $.when ($.ajax(ep_status))
         .then(function(data) {
@@ -788,11 +906,15 @@ var j1 = (function () {
           user_session = j1.mergeData(user_session, data);
 
           user_session.current_page = current_url.pathname;
-          j1.writeCookie({
+          cookie_written = j1.writeCookie({
             name:     cookie_names.user_session,
             data:     user_session,
-            samesite: 'Strict'
+            samesite: 'Strict',
+            secure:   secure
           });
+          if (!cookie_written) {
+          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+          }
 
           providerPermissions = user_session.provider_permissions;
           categoryAllowed     = providerPermissions.includes(user_session.page_permission);
@@ -818,17 +940,66 @@ var j1 = (function () {
 
           // show the page delayed
           setTimeout (function() {
+
+            // Manage providers for personalization OptIn/Out (Comments|Ads)
+            if (!user_consent.personalization) {
+              logger.warn('\n' + 'disable comment provider: ' + comment_provider);
+              $('#leave-a-comment').remove();
+              if (comment_provider === 'disqus') {
+                $('#dsq-count-scr').remove();
+                $('#disqus-thread').remove();
+              }
+              if (comment_provider === 'hyvor') {
+                $('#hyvor-embed').remove();
+                $('#hyvor-talk-view').remove();
+              }
+            } else {
+              if (comments) {
+                logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+                $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">Leave a comment</h2>');
+                if (comment_provider === 'disqus') {
+                  logger.info('\n' + 'load comment provider code: ' + comment_provider);
+                  $('#main-content').append('<div id="disqus_thread"></div>');
+                  $('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
+                  j1.loadJS({
+                    xhr_data_path:    '/assets/data/' + comment_provider + '.js',
+                    xhr_data_element: comment_provider
+                  });
+                }
+                if (comment_provider === 'hyvor') {
+                  $('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
+                  $('#main-content').append('<div id="hyvor-talk-view"></div>');
+                  $('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
+                }
+              } // END comments
+            } // END personalization
+
             // display page
-            $('#no_flicker').css('display', 'block');
+           $('#no_flicker').css('display', 'block');
+
+            // NOTE: Placed tracking warning/info here because page may reloaded
+            // after cookie consent selection
+            if (user_consent.analyses) {
+              logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analyses);
+              if (tracking_enabled && !tracking_id_valid) {
+                logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
+              } else if (tracking_enabled && tracking_id_valid) {
+                logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+              } else {
+                logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+              }
+            } else {
+              logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
+            }
 
             // show|hide cookie icon (should MOVED to Cookiebar ???)
             if (j1.existsCookie(cookie_names.user_consent)) {
               // Display cookie icon
-              logText = 'show cookie icon';
+              logText = '\n' + 'show cookie icon';
               logger.info(logText);
               $('#quickLinksCookieButton').css('display', 'block');
             } else {
-              logText = 'hide cookie icon';
+              logText = '\n' + 'hide cookie icon';
               logger.info(logText);
               // Display cookie icon
               $('#quickLinksCookieButton').css('display', 'none');
@@ -836,8 +1007,8 @@ var j1 = (function () {
 
             // show|hide translator icon (currently NOT supported)
             // if (translation_enabled) {
-            //   logger.info('translator detected: google');
-            //   logger.info('initialize language selector');
+            //   logger.info('\n' + 'translator detected: google');
+            //   logger.info('\n' + 'initialize language selector');
             //   $('.goog-te-combo').addClass('form-control');
             // }
 
@@ -847,16 +1018,16 @@ var j1 = (function () {
             if (j1.authEnabled()) {
               if (user_session.authenticated === 'true') {
                 // set signout
-                logger.info('show signout icon');
+                logger.info('\n' + 'show signout icon');
                 $('#navLinkSignInOut').attr('data-target','#modalOmniSignOut');
                 $('#iconSignInOut').removeClass('mdi-login').addClass('mdi-logout');
               } else {
                 // set signin
-                logger.info('show signin icon');
+                logger.info('\n' + 'show signin icon');
                 $('#navLinkSignInOut').attr('data-target','#modalOmniSignIn');
                 $('#iconSignInOut').removeClass('mdi-logout').addClass('mdi-login');
               }
-              logger.info('authentication detected as: ' + user_session.authenticated);
+              logger.info('\n' + 'authentication detected as: ' + user_session.authenticated);
               $('#quickLinksSignInOutButton').css('display', 'block');
             }
 
@@ -865,25 +1036,25 @@ var j1 = (function () {
             j1.scrollTo();
 
             if (user_session.previous_page !== user_session.current_page) {
-              logText = 'page change detected';
+              logText = '\n' + 'page change detected';
               logger.info(logText);
-              logText = 'previous page: ' + user_session.previous_page;
+              logText = '\n' + 'previous page: ' + user_session.previous_page;
               logger.info(logText);
-              logText = 'current page: ' + user_session.current_page;
+              logText = '\n' + 'current page: ' + user_session.current_page;
               logger.info(logText);
             }
 
             // update sidebar for changed theme data
-            logger.info('update sidebar');
+            logger.info('\n' + 'update sidebar');
             user_state        = j1.readCookie(cookie_names.user_state);
             current_user_data = j1.mergeData(user_session, user_state);
             j1.core.navigator.updateSidebar(current_user_data);
 
             // Set|Log status
             state = 'finished';
-            logText = 'state: ' + state;
+            logText = '\n' + 'state: ' + state;
             logger.info(logText);
-            logText = 'page finalized successfully';
+            logText = '\n' + 'page finalized successfully';
             logger.info(logText);
 
           }, flickerTimeout);
@@ -892,27 +1063,79 @@ var j1 = (function () {
         // show the page delayed
         setTimeout (function() {
           j1.setState('finished');
-          logger.info('state: finished');
-          logger.info('page initialization: finished');
+          logger.info('\n' + 'state: finished');
+          logger.info('\n' + 'page initialization: finished');
+
+          // Manage providers for personalization OptIn/Out (Comments|Ads)
+          if (!user_consent.personalization) {
+            logger.warn('\n' + 'disable comment provider: ' + comment_provider);
+            $('#leave-a-comment').remove();
+            if (comment_provider === 'disqus') {
+              $('#dsq-count-scr').remove();
+              $('#disqus-thread').remove();
+            }
+            if (comment_provider === 'hyvor') {
+              $('#hyvor-embed').remove();
+              $('#hyvor-talk-view').remove();
+            }
+          } else {
+            if (comments) {
+              logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+              $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">Leave a comment</h2>');
+              if (comment_provider === 'disqus') {
+                logger.info('\n' + 'load comment provider code: ' + comment_provider);
+                $('#main-content').append('<div id="disqus_thread"></div>');
+                $('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
+                j1.loadJS({
+                  xhr_data_path:    '/assets/data/' + comment_provider + '.js',
+                  xhr_data_element: comment_provider
+                });
+              }
+              if (comment_provider === 'hyvor') {
+                $('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
+                $('#main-content').append('<div id="hyvor-talk-view"></div>');
+                $('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
+              }
+            } // END comments
+          } // END personalization
 
           // display page
           $('#no_flicker').css('display', 'block');
 
-          logger.info('mode detected: web');
-          logger.info('hide signin icon');
+          // NOTE: Placed tracking warning/info here because page may reloaded
+          // after cookie consent selection
+          if (user_consent.analyses) {
+            logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analyses);
+            if (tracking_enabled && !tracking_id_valid) {
+              logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
+            } else if (tracking_enabled && tracking_id_valid) {
+              logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+            } else {
+              logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+            }
+          } else {
+            logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
+          }
+
+          logger.info('\n' + 'mode detected: web');
+          logger.info('\n' + 'hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
 
           user_session.current_page = current_url.pathname;
-          j1.writeCookie({
+          cookie_written = j1.writeCookie({
               name:     cookie_names.user_session,
               data:     user_session,
-              samesite: 'Strict'
+              samesite: 'Strict',
+              secure:   secure
           });
+          if (!cookie_written) {
+          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+          }
 
           // show|hide translator icon (currently NOT supported)
           // if (translation_enabled) {
-          //   logger.info('translator detected: google');
-          //   logger.info('initialize language selector');
+          //   logger.info('\n' + 'translator detected: google');
+          //   logger.info('\n' + 'initialize language selector');
           //   $('.goog-te-combo').addClass('form-control');
           // }
 
@@ -922,11 +1145,11 @@ var j1 = (function () {
           // show|hide cookie icon
           if (j1.existsCookie(cookie_names.user_consent)) {
             // Display cookie icon
-            logText = 'show cookie icon';
+            logText = '\n' + 'show cookie icon';
             logger.info(logText);
             $('#quickLinksCookieButton').css('display', 'block');
           } else {
-            logText = 'hide cookie icon';
+            logText = '\n' + 'hide cookie icon';
             logger.info(logText);
             // Display cookie icon
             $('#quickLinksCookieButton').css('display', 'none');
@@ -937,25 +1160,25 @@ var j1 = (function () {
           j1.scrollTo();
 
           if (user_session.previous_page !== user_session.current_page) {
-            logText = 'page change detected';
+            logText = '\n' + 'page change detected';
             logger.info(logText);
-            logText = 'previous page: ' + user_session.previous_page;
+            logText = '\n' + 'previous page: ' + user_session.previous_page;
             logger.info(logText);
-            logText = 'current page: ' + user_session.current_page;
+            logText = '\n' + 'current page: ' + user_session.current_page;
             logger.info(logText);
           }
 
           // update sidebar for changed theme data
-          logger.info('update sidebar');
+          logger.info('\n' + 'update sidebar');
           user_state        = j1.readCookie(cookie_names.user_state);
           current_user_data = j1.mergeData(user_session, user_state);
           j1.core.navigator.updateSidebar(current_user_data);
 
           // set|log status
           state = 'finished';
-          logText = 'state: ' + state;
+          logText = '\n' + 'state: ' + state;
           logger.info(logText);
-          logText = 'page finalized successfully';
+          logText = '\n' + 'page finalized successfully';
           logger.info(logText);
 
         }, flickerTimeout);
@@ -1063,7 +1286,7 @@ var j1 = (function () {
           $(window).scrollTop($(window).scrollTop()-1);
         } // END if anchor_id
       } else if (anchor_id === '#') {
-        logger.info('bound click event to "#", suppress default action');
+        logger.info('\n' + 'bound click event to "#", suppress default action');
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
         return false;
@@ -1101,12 +1324,12 @@ var j1 = (function () {
     }, // END appDetected
 
     // -------------------------------------------------------------------------
-    // xhrData()
-    // Load data asychronously using XHR|jQuery on an HTML element (e.g. <div>)
+    // loadHTML()
+    // Load HTML data asychronously using XHR|jQuery on an element (e.g. <div>)
     // specified by xhr_container_id, xhr_data_path (options)
     // -------------------------------------------------------------------------
-    xhrData: function (options, mod, status) {
-      var logger            = log4javascript.getLogger('j1.adapter.xhrData');
+    loadHTML: function (options, mod, status) {
+      var logger            = log4javascript.getLogger('j1.adapter.loadHTML');
       var selector          = $('#' + options.xhr_container_id);
       var state             = status;
       var observer_options  = {
@@ -1120,12 +1343,12 @@ var j1 = (function () {
 
       var cb_load_closure = function(mod, id) {
         return function (responseTxt, statusTxt, xhr) {
-          var logger = log4javascript.getLogger('j1.adapter.xhrData');
+          var logger = log4javascript.getLogger('j1.adapter.loadHTML');
           if ( statusTxt === 'success' ) {
             j1.setXhrDataState(id, statusTxt);
             j1.setXhrDomState(id, 'pending');
 
-            logText = 'data loaded successfully on id: ' +id;
+            logText = '\n' + 'data loaded successfully on id: ' +id;
             logger.info(logText);
             state = true;
           }
@@ -1133,12 +1356,12 @@ var j1 = (function () {
             // jadams, 2020-07-21: to be checked why id could be UNDEFINED
             if (typeof(id) != "undefined") {
               state = 'failed';
-              logger.info('set state for ' +mod+ ' to: ' + state);
+              logger.info('\n' + 'set state for ' +mod+ ' to: ' + state);
               // jadams, 2020-07-21: intermediate state should DISABLED
               // executeFunctionByName(mod + '.setState', window, state);
               j1.setXhrDataState(id, statusTxt);
               j1.setXhrDomState(id, 'pending');
-              logText = 'loading data failed on id: ' +id+ ', error ' + xhr.status + ': ' + xhr.statusText;
+              logText = '\n' + 'loading data failed on id: ' +id+ ', error ' + xhr.status + ': ' + xhr.statusText;
               logger.error(logText);
               state = false;
             }
@@ -1159,9 +1382,9 @@ var j1 = (function () {
 
       // failsafe - prevent XHR load errors
       if (options.xhr_data_element !== '') {
-        logger.info('XHR data element found: ' + options.xhr_data_element);
+        logger.info('\n' + 'XHR data element found: ' + options.xhr_data_element);
       } else  {
-        logger.warn('no XHR data element found, loading data aborted');
+        logger.warn('\n' + 'no XHR data element found, loading data aborted');
         return;
       }
 
@@ -1183,33 +1406,71 @@ var j1 = (function () {
         function mutationHandler (mutationRecords) {
           mutationRecords.forEach ( function (mutation) {
             if (mutation.addedNodes.length) {
-              logger.info('XHR data loaded in the DOM: ' + id);
+              logger.info('\n' + 'XHR data loaded in the DOM: ' + id);
               j1.setXhrDomState(id, 'success');
             }
           });
         }
       } else {
         // jadams, 2020-07-21: To be clarified why a id is "undefined"
-
         // failsafe - prevent XHR load errors
         if (id != '#undefined') {
-          logText = 'data not loaded on id:' + id;
+          logText = '\n' + 'data not loaded on id:' + id;
           logger.warn(logText);
           j1.setXhrDataState(id, 'not loaded');
           j1.setXhrDomState(id, 'not loaded');
           // Set processing state to 'finished' to complete module load
           state = 'finished';
-          logger.info('state: ' + state);
+          logger.info('\n' + 'state: ' + state);
           // jadams, 2020-07-21: intermediate state should DISABLED
           // executeFunctionByName(mod + '.setState', window, state);
           state = false;
         }
       }
       return state;
-    }, // END xhrData
+    }, // END loadHTML
+
+    // -------------------------------------------------------------------------
+    // loadJS()
+    // Load JS data asychronously using jQuery (XHR)
+    // -------------------------------------------------------------------------
+    loadJS: function (options, mod, status) {
+      var logger  = log4javascript.getLogger('j1.adapter.loadJS');
+      var state   = status;
+      var logText;
+
+      var cb_load_closure = function(mod, id) {
+        return function (responseTxt, statusTxt, xhr) {
+          var logger = log4javascript.getLogger('j1.adapter.loadJS');
+          if ( statusTxt === 'success' ) {
+            j1.setXhrDataState(id, statusTxt);
+
+            logText = '\n' + 'data loaded successfully for: ' +id;
+            logger.info(logText);
+            state = true;
+          }
+          if ( statusTxt === 'error' ) {
+            state = 'failed';
+            logger.info('\n' + 'set state for ' +mod+ ' to: ' + state);
+            j1.setXhrDataState(id, statusTxt);
+            logText = '\n' + 'loading data failed for: ' +id+ ', error ' + xhr.status + ': ' + xhr.statusText;
+            logger.error(logText);
+            state = false;
+          }
+        };
+      };
+
+      $.ajax({
+        url:      options.xhr_data_path,
+        dataType: 'script',
+        success:  cb_load_closure(mod, options.xhr_data_element)
+      });
+
+      return state;
+    }, // END loadJS
 
     // -------------------------------------------------------------------------
-    //  readCookie()
+    //  readCookie (Vanilla JS)
     // -------------------------------------------------------------------------
     readCookie: function (name) {
       var data;
@@ -1231,20 +1492,7 @@ var j1 = (function () {
     }, // END readCookie
 
     // -------------------------------------------------------------------------
-    // findCookie()
-    // Search for cookies (names) in the page header that matches
-    // a given regex string. Returns all names found as an array.
-    // -------------------------------------------------------------------------
-    // See: https://stackoverflow.com/questions/52287989/javascript-cookie-remove-or-delete-with-regex-regular-expression
-    // -------------------------------------------------------------------------
-    findCookie: function (regex) {
-      var r=[];
-      document.cookie.replace(new RegExp(regex + "[^= ]*", "g"), function(a){ r.push(a.trim()); });
-      return r;
-    }, // END findCookie
-
-    // -------------------------------------------------------------------------
-    // writeCookie()
+    // writeCookie (Cookie lib)
     // Write 'data' to a cookie 'name'. If not exists, the cookie gets
     // created. Returns 'true' if cookie was written, otherwise 'false'.
     // -------------------------------------------------------------------------
@@ -1269,58 +1517,61 @@ var j1 = (function () {
     //    must now also specify the Secure attribute (they require a secure
     //    context/HTTPS).
     // -------------------------------------------------------------------------
-    //
     writeCookie: function (options /*name, data, [path, expires, samesite, http_only, secure]*/) {
       var defaults = {
           data: {},
           name: '',
           path: '/',
           expires: 0,
-          samesite: 'Lax',
+          samesite: 'Strict',
           http_only: false,
           secure: false
       };
       var settings = $.extend(defaults, options);
+
       var date          = new Date();
       var timestamp_now = date.toISOString();
       var cookie_data   = {};
       var data_json;
       var data_encoded;
+      var expires;
+      var stringifiedAttributes = '';
+
+      cookie_data.timestamp = timestamp_now;
 
       if (j1.existsCookie(settings.name)) {
-        cookie_data           = j1.readCookie(settings.name);
-        cookie_data.timestamp = timestamp_now;
-        cookie_data           = j1.mergeData(cookie_data, settings.data);
-        data_json             = JSON.stringify( cookie_data );
-        data_encoded          = window.btoa(data_json);
-
-        if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, {
-            expires: settings.expires,
-            SameSite: settings.samesite
-          });
-        } else {
-          Cookies.set(settings.name, data_encoded, {
-          SameSite: settings.samesite
-          });
-        }
+        cookie_data   = j1.readCookie(settings.name);
+        cookie_data   = j1.mergeData(cookie_data, settings.data);
+        data_json     = JSON.stringify( cookie_data );
+        data_encoded  = window.btoa(data_json);
       } else {
         cookie_data   = settings.data;
         data_json     = JSON.stringify(settings.data);
         data_encoded  = window.btoa(data_json);
+      }
 
-        if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, {
-            expires: settings.expires,
-            SameSite: settings.samesite
-          });
-        } else {
-          Cookies.set(settings.name, data_encoded, {
-            SameSite: settings.samesite
-          });
-        }
+//    if (settings.path !== '/') {
+        stringifiedAttributes += '; ' + 'path=' + settings.path;
+//    }
+
+      if (settings.expires > 0) {
+        settings.expires = new Date(new Date() * 1 + settings.expires * 864e+5);
+        stringifiedAttributes += '; ' + 'expires=' + settings.expires;
       }
 
+//    if (settings.samesite !== 'Strict') {
+        stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+//    }
+
+      // stringify cookie attributes
+      if (settings.secure) {
+        stringifiedAttributes += '; ' + 'secure=' + settings.secure;
+        // document.cookie = settings.name + '=' + content +'; path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; secure';
+      }
+
+      // write the cookie
+      document.cookie = settings.name + '=' + data_encoded + stringifiedAttributes;
+
       if (j1.existsCookie(settings.name)) {
         return cookie_data;
       } else {
@@ -1330,63 +1581,112 @@ var j1 = (function () {
     }, // END writeCookie
 
     // -------------------------------------------------------------------------
-    // Clears all given cookies by name (except cookies set to httpOnly).
-    // For all cookies the expire date is set in the past, those cookies
-    // are 'session' cookies. All session cookies are deleted (automatically)
-    // by the browser if the last session (browser window) is closed.
-    // See: https://stackoverflow.com/questions/179355/clearing-all-cookies-with-javascript
+    // findCookie (Vanilla JS)
+    // Search for cookies (names) in the page header that matches a given
+    // name. Cookie name can be give as full name, like 'j1.user.state', or
+    // as a partial like 'j1'
+    // Returns all names found as an array.
+    // -------------------------------------------------------------------------
+    // See: https://stackoverflow.com/questions/52287989/javascript-cookie-remove-or-delete-with-regex-regular-expression
     // -------------------------------------------------------------------------
-    removeCookie: function (options /*name [, path]*/) {
+    findCookie: function (name) {
+      var rCookie=[];
+      document.cookie.replace(new RegExp(name + '[^= ]*', 'g'), function(a){ rCookie.push(a.trim()); });
+
+      return rCookie;
+    }, // END findCookie
+
+    // -------------------------------------------------------------------------
+    // removeCookie (Vanilla JS)
+    // -------------------------------------------------------------------------
+    removeCookie: function (options /*name, [path, domain]*/) {
       var cookieExists;
       var defaults = {
-          name: '',
+          domain: 'localhost',
           path: '/'
       };
       var settings = $.extend(defaults, options);
 
-      Cookies.remove(settings.name, { path: settings.path });
-
+      if (j1.findCookie(settings.name)) {
+        // clear cookie CONTENT and set expiry date in the PAST
+        document.cookie = settings.name + '=; domain=' + settings.domain + '; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+        return true;
+      } else {
+        return false;
+      }
     }, // END removeCookie
 
     // -------------------------------------------------------------------------
-    // Clears all given cookies by name (except cookies set to httpOnly).
-    // For all cookies the expire date is set in the past, those cookies
-    // are 'session' cookies. All session cookies are deleted (automatically)
-    // by the browser if the last session (browser window) is closed.
+    // expireCookie (Vanilla JS)
+    // Expires given cookies by name except cookies set to httpOnly. For all
+    // cookies the expiry date is REMOVED. This results in cookies are set
+    // to 'session' for the expiry date. All session cookies are deleted
+    // automatically by the browser if the last session (browser tab|window)
+    // is closed.
+    // -------------------------------------------------------------------------
+    // expireCookie() returns 'true' if cookie is set successfully,
+    // otherwise 'false' (e.g NOT found)
+    // -------------------------------------------------------------------------
+    // NOTE:
     // See: https://stackoverflow.com/questions/179355/clearing-all-cookies-with-javascript
+    // NOTE:
+    // There is NO way you could get a trace of Path, Domain and other
+    // attributes of cookies as they are only read by browsers and NOT shown
+    // to JavaScript. For that reason, attributes needs to be set explicitly.
     // -------------------------------------------------------------------------
-    deleteCookie: function (name) {
-      var all_cookies = document.cookie.split('; ');
-
-      if ( name === 'all' ) {
-        for (var c = 0; c < all_cookies.length; c++) {
-          var d = window.location.hostname.split('.');
-          while (d.length > 0) {
-            var cookieBase = encodeURIComponent(all_cookies[c].split(';')[0].split('=')[0]) + '=; expires=Thu, 01-Jan-1970 00:00:01 GMT; domain=' + d.join('.') + ' ;path=';
-            var p = location.pathname.split('/');
-            document.cookie = cookieBase + '/';
-            while (p.length > 0) {
-              document.cookie = cookieBase + p.join('/');
-              p.pop();
-            };
-            d.shift();
-          }
-        }
+    expireCookie: function (options /*name [,path, samesite, secure]*/) {
+      var defaults = {
+          path: '/',
+          samesite: 'Strict',
+          secure: false
+      };
+      var settings  = $.extend(defaults, options);
+
+      var dc        = document.cookie;                                            // all cookies in page
+      var end       = dc.length;                                                  // default to end of the string
+      var prefix    = settings.name + '=';                                                 // search string for the cookie name given
+      var begin     = dc.indexOf('; ' + prefix);
+      var content   = '';
+
+      // collect the cookie content
+      //
+      // found, and not in the first position
+      if (begin !== -1) {
+        // exclude the "; "
+        begin += 2;
+      } else {
+        // see if cookie is in first position
+        begin = dc.indexOf(prefix);
+        // not found at all or found as a portion of another cookie name
+        if (begin === -1 || begin !== 0 ) return false;
+      }
+
+      // if ";" is found somewhere after the prefix position then "end" is
+      // that position, otherwise it defaults to the end of the string
+      if (dc.indexOf(';', begin) !== -1) {
+        end = dc.indexOf(';', begin);
+      }
+
+      // expire cookie to session
+      content = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
+      if (settings.secure) {
+        document.cookie = settings.name + '=' + content +'; path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; secure';
       } else {
-        document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+        document.cookie = settings.name + '=' + content +'; path=' + settings.path + '; ' + 'SameSite=' + settings.samesite;
       }
 
       return true;
-    }, // END deleteCookie
+    }, // END expireCookie
 
     // -------------------------------------------------------------------------
-    //  returns true if a given cookie exists
+    // existsCookie (Vanilla JS)
+    // returns true if a given cookie exists
     // -------------------------------------------------------------------------
     existsCookie: function (name) {
       var dc            = document.cookie;
       var prefix        = name + '=';
       var begin         = dc.indexOf('; ' + prefix);
-      var end           = dc.length; // default to end of the string
+      var end           = dc.length;                                            // default to end of the string
       var cookieExists  = false;
       var cookieContent = '';
 
@@ -1479,11 +1779,11 @@ var j1 = (function () {
               });
 
             });
-            logger.info('met dependencies for: sidebarLoaded');
+            logger.info('\n' + 'met dependencies for: sidebarLoaded');
             clearInterval(sidebarLoaded);
             return true;
           } else {
-            logger.error('no user data provided');
+            logger.error('\n' + 'no user data provided');
             clearInterval(sidebarLoaded);
             return false;
           }
@@ -1537,11 +1837,11 @@ var j1 = (function () {
               });
 
             });
-            logger.info('met dependencies for: sidebarLoaded');
+            logger.info('\n' + 'met dependencies for: sidebarLoaded');
             clearInterval(sidebarLoaded);
             return true;
           } else {
-            logger.error('no user data provided');
+            logger.error('\n' + 'no user data provided');
             clearInterval(sidebarLoaded);
             return false;
           }
@@ -1580,11 +1880,11 @@ var j1 = (function () {
       var json_message  = JSON.stringify(message);
 
       if ( receiver === 'j1' ) {
-        logText = 'send message from ' + sender + ' to' + receiver + ': ' + json_message;
+        logText = '\n' + 'send message from ' + sender + ' to' + receiver + ': ' + json_message;
         logger.debug(logText);
         executeFunctionByName('j1' + '.messageHandler', window, sender, message);
       } else {
-        logText = 'send message from ' + sender + ' to ' + receiver + ': ' + json_message;
+        logText = '\n' + 'send message from ' + sender + ' to ' + receiver + ': ' + json_message;
         logger.debug(logText);
         //executeFunctionByName('j1.' + receiver + '.messageHandler', window, sender, message)
         executeFunctionByName(receiver + '.messageHandler', window, sender, message);
@@ -1600,7 +1900,7 @@ var j1 = (function () {
       // var json_message  = JSON.stringify(message, undefined, 2);             // multiline
       var json_message  = JSON.stringify(message);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -1608,7 +1908,7 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
         _this.setState('finished');
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //
@@ -1671,7 +1971,7 @@ var j1 = (function () {
       var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
       var bg_secondary  = j1.getStyleValue('bg-secondary', 'background-color');
 
-      logger.info('set color scheme for selected theme');
+      logger.info('\n' + 'set color scheme for selected theme');
 
       // globals
       // -----------------------------------------------------------------------