j1-template 2022.0.9 → 2022.0.13

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

@@ -60,8 +60,8 @@ regenerate:                             true
 {% 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 tracking_enabled          = modules.analytics.enabled %}
+{% assign tracking_id               = modules.analytics.google.trackingID %}
 
 {% assign authentication_defaults   = modules.defaults.authentication.defaults %}
 {% assign authentication_settings   = modules.authentication.settings %}
@@ -82,24 +82,10 @@ regenerate:                             true
 {% assign themer_enabled            = modules.themer_options.enabled %}
 {% assign themer_reloadPageOnChange = modules.themer_options.reloadPageOnChange %}
 {% assign themer_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' %}
   {% assign production = true %}
@@ -115,14 +101,6 @@ regenerate:                             true
   {% assign language = "en" %}
 {% endif %}
 
-{% if language == "en" %}
-  {% assign comments_headline = template_config.comments.comments_headline.en %}
-{% endif %}
-
-{% if language == "de" %}
-  {% assign comments_headline = template_config.comments.comments_headline.de %}
-{% endif %}
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1_template.js
@@ -151,30 +129,30 @@ regenerate:                             true
 /* eslint semi: "off"                                                         */
 // -----------------------------------------------------------------------------
 'use strict';
-
 var j1 = (function () {
 
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var rePager                   =  new RegExp('navigator|dateview|tagview|archive');
-  var environment               = '{{environment}}';
-  var moduleOptions             = {};
-  var j1_runtime_data           = {};
+  var rePager                     =  new RegExp('navigator|dateview|tagview|archive');
+  var environment                 = '{{environment}}';
+  var moduleOptions               = {};
+  var j1_runtime_data             = {};
 
   // Status information
-  var state                     = 'not_started';
-  var mode                      = 'not_detected';
+  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;
+  // 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}}';
-  var check_cookies             = {{cookie_options.check_cookies}};
+  var comment_provider            = '{{comment_provider}}';
+  var site_id                     = '{{site_id}}';
+  var checkCookies                = {{cookie_options.checkCookies}};
+  var expireCookiesOnRequiredOnly = ('{{cookie_options.expireCookiesOnRequiredOnly}}' === 'true') ? true: false;
 
   var current_user_data;
   var current_page;
@@ -275,7 +253,15 @@ var j1 = (function () {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // global var (function)
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       var logger            = log4javascript.getLogger('j1.init');
       var url               = new liteURL(window.location.href);
@@ -290,15 +276,6 @@ var j1 = (function () {
       var j1Cookies         = j1.findCookie('j1');
       var themerOptions     = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
-      // -----------------------------------------------------------------------
-      // options loader
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        foo: 'foo_option',
-        bar: 'bar_option'
-        },
-        options
-      );
       // -----------------------------------------------------------------------
       // status settings
       // save status into the adapter object for (later) global access
@@ -371,7 +348,7 @@ var j1 = (function () {
 
       // jadams, 2021-12-06: Check if access to cookies for this site failed.
       // Possibly, a third-party domain or an attacker tries to access it.
-      if (check_cookies) {
+      if (checkCookies) {
         if (!user_state) {
           logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
           logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
@@ -381,10 +358,12 @@ var j1 = (function () {
       }
 
       if (!user_consent.analysis || !user_consent.personalization)  {
-        // expire permanent cookies to session
-        j1.expireCookie({ name: cookie_names.user_state });
-        j1.expireCookie({ name: cookie_names.user_consent });
-        j1.expireCookie({ name: cookie_names.user_translate });
+        if (expireCookiesOnRequiredOnly) {
+          // expire permanent cookies to session
+          j1.expireCookie({ name: cookie_names.user_state });
+          j1.expireCookie({ name: cookie_names.user_consent });
+          j1.expireCookie({ name: cookie_names.user_translate });
+        }
       }
 
       // initialize event handler for window/history/back on <ESC>
@@ -848,6 +827,7 @@ var j1 = (function () {
       var categoryAllowed;
 
       // 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');
@@ -864,6 +844,7 @@ var j1 = (function () {
       var personalization       = (meta_personalization === 'true') ? true: false;
 
       // if personalized content detected, page requires user consent
+      // -----------------------------------------------------------------------
       if (personalization && !user_consent.personalization) {
         // redirect to error page: blocked content
         window.location.href = '/444.html';
@@ -873,7 +854,9 @@ var j1 = (function () {
       logText= '\n' + 'loading page partials: started';
       logger.info(logText);
 
-      if (j1.appDetected()) { // app mode
+      if (j1.appDetected()) {
+        // app mode
+        // ---------------------------------------------------------------------
         logger.info('\n' + 'mode detected: app');
 
         $.when ($.ajax(ep_status))
@@ -916,78 +899,22 @@ var j1 = (function () {
 
           // show the page delayed
           setTimeout (function() {
-            // Manage providers for personalization OptIn/Out (Comments|Ads)
-            if (!user_consent.personalization) {
-              logger.debug('\n' + 'disable comment provider: ' + comment_provider);
-              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
-              $('#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.info('\n' + 'enable comment provider: ' + comment_provider);
-                $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</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>');
-                }
-              }
-            }
-
             // display page
-           $('#no_flicker').css('display', 'block');
+            $('#no_flicker').css('display', 'block');
 
-           // no dropcaps if translation enabled
-           if (user_translate.translationEnabled) {
+            // manage Dropcaps if translation is enabled|disabled
+            // -----------------------------------------------------------------
+            if (user_translate.translationEnabled) {
              logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
              logger.debug('\n' + 'skipped processing of dropcaps');
-           } else {
+            } else {
              // initialize dropcaps
              logger.info('\n' + 'post processing: createDropCap');
              j1.core.createDropCap();
-           }
-
-             // add recommended title to hyvor iframe for SEO optimization (if loadad)
-            if (comment_provider === 'hyvor') {
-              var dependencies_met_load_finished = setInterval (function () {
-                if ($('#hyvor-talk-view').children().length) {
-                    $('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
-                    clearInterval(dependencies_met_load_finished);
-                }
-              }, 25);
-            }
-            // NOTE: Placed tracking warning/info here because page may reloaded
-            // after cookie consent selection
-            if (user_consent.analysis) {
-              logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
-              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.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
-              } else {
-                logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
-              }
-            } else {
-              logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
             }
 
-            // show|hide cookie icon (should MOVED to Cookiebar ???)
+            // TODO: should MOVED to Cookiebar ???
+            // show|hide cookie icon
             if (j1.existsCookie(cookie_names.user_consent)) {
               // Display cookie icon
               logText = '\n' + 'show cookie icon';
@@ -1000,6 +927,7 @@ var j1 = (function () {
               $('#quickLinksCookieButton').css('display', 'none');
             }
 
+            // TODO: should MOVED to ControlCenter Adapter ???
             // -----------------------------------------------------------------
             // show cc icon (currently NOT supported)
             // $('#quickLinksControlCenterButton').css('display', 'block');
@@ -1020,6 +948,7 @@ var j1 = (function () {
               $('#quickLinksSignInOutButton').css('display', 'block');
             }
 
+            // TODO: should MOVED to Themer ???
             // jadams, 2021-07-25: hide|show themes menu on cookie consent
             // (analysis|personalization) settings. BootSwatch is a 3rd party
             // is using e.g GA. Because NO control is possible on 3rd parties,
@@ -1033,10 +962,7 @@ var j1 = (function () {
               $("#themes_menu").show();
             }
 
-            // if the page requested contains an anchor element,
-            // do a smooth scroll to
-            j1.scrollTo();
-
+            // detect if a loaded page has been chenged
             if (user_session.previous_page !== user_session.current_page) {
               logText = '\n' + 'page change detected';
               logger.info(logText);
@@ -1052,56 +978,34 @@ var j1 = (function () {
             current_user_data = j1.mergeData(user_session, user_state);
             j1.core.navigator.updateSidebar(current_user_data);
 
-            // Set|Log status
+            // set|log status
             state = 'finished';
+            j1.setState(state);
             logText = '\n' + 'state: ' + state;
             logger.info(logText);
             logText = '\n' + 'page finalized successfully';
             logger.info(logText);
+
+            // do a (smooth) scroll if all nav elements ready
+            // -----------------------------------------------------------------
+            var dependencies_met_navigator_finished = setInterval(function() {
+              if (j1.adapter.navigator.getState() == 'finished') {
+                // if a page requested contains an anchor element, do a smooth scroll
+                j1.scrollTo();
+                clearInterval(dependencies_met_navigator_finished);
+              }
+            }, 25);
           }, flickerTimeout);
         });
       } else {
         // web mode
+        // ---------------------------------------------------------------------
         setTimeout (function() {
-          j1.setState('finished');
+          // j1.setState('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.debug('\n' + 'disable comment provider: ' + comment_provider);
-            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
-            $('#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.info('\n' + 'enable comment provider: ' + comment_provider);
-              $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</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>');
-              }
-            }
-          }
-
-          // display page
+          // display the page loaded
           $('#no_flicker').css('display', 'block');
 
           // jadams, 2021-11-19: test code for 'tapTarget' of 'materializeCss'
@@ -1128,7 +1032,8 @@ var j1 = (function () {
               $(this).parents(".card-header").toggleClass("highlight");
           });
 
-          // no dropcaps if translation enabled
+          // manage Dropcaps if translation is enabled|disabled
+          // -------------------------------------------------------------------
           if (user_translate.translationEnabled) {
             logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
             logger.debug('\n' + 'skipped processing of dropcaps');
@@ -1138,31 +1043,6 @@ var j1 = (function () {
             j1.core.createDropCap();
           }
 
-          // add recommended title to hyvor iframe for SEO optimization (if loadad)
-         if (comment_provider === 'hyvor') {
-           var dependencies_met_load_finished = setInterval (function () {
-             if ($('#hyvor-talk-view').children().length) {
-               $('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
-               clearInterval(dependencies_met_load_finished);
-             }
-           }, 25);
-         }
-
-          // NOTE: Placed tracking warning/info here because page may reloaded
-          // after cookie consent selection
-          if (user_consent.analysis) {
-            logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
-            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.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
-            } else {
-              logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
-            }
-          } else {
-            logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
-          }
-
           logger.info('\n' + 'mode detected: web');
           logger.info('\n' + 'hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
@@ -1176,9 +1056,12 @@ var j1 = (function () {
               expires:  0
           });
 
+          // TODO: should MOVED to ControlCenter Adapter ???
+          // -----------------------------------------------------------------
           // show cc icon (currently NOT supported)
           // $('#quickLinksControlCenterButton').css('display', 'block');
 
+          // TODO: should MOVED to Cookiebar ???
           // show|hide cookie icon
           if (j1.existsCookie(cookie_names.user_consent)) {
             // Display cookie icon
@@ -1192,6 +1075,7 @@ var j1 = (function () {
             $('#quickLinksCookieButton').css('display', 'none');
           }
 
+          // TODO: should MOVED to Themer ???
           // jadams, 2021-07-25: hide|show themes menu on cookie consent
           // (analysis|personalization) settings. BootSwatch is a 3rd party
           // is using e.g GA. Because NO control is possible on 3rd parties,
@@ -1205,10 +1089,7 @@ var j1 = (function () {
             $("#themes_menu").show();
           }
 
-          // If the page requested contains an anchor element,
-          // do a smooth scroll
-          j1.scrollTo();
-
+          // detect if a loaded page has been chenged
           if (user_session.previous_page !== user_session.current_page) {
             logText = '\n' + 'page change detected';
             logger.info(logText);
@@ -1226,10 +1107,21 @@ var j1 = (function () {
 
           // set|log status
           state = 'finished';
+          j1.setState(state);
           logText = '\n' + 'state: ' + state;
           logger.info(logText);
           logText = '\n' + 'page finalized successfully';
           logger.info(logText);
+
+          // do a (smooth) scroll if all nav elements ready
+          // -------------------------------------------------------------------
+          var dependencies_met_navigator_finished = setInterval(function() {
+            if (j1.adapter.navigator.getState() == 'finished') {
+              // if a page requested contains an anchor element, do a smooth scroll
+              j1.scrollTo();
+              clearInterval(dependencies_met_navigator_finished);
+            }
+          }, 25);
         }, flickerTimeout);
       }
     },
@@ -1322,9 +1214,9 @@ var j1 = (function () {
       var anchor          = window.location.href.split('#')[1];
       var anchor_id       = typeof anchor !== 'undefined' ? '#' + anchor : false;
       var scrollDuration  = {{toccer_options.scrollSmoothDuration}};
+      var scrollOffset    = j1.getScrollOffset();
       var isSlider        = false;
       var selector;
-      var scrollOffset;
 
       if (typeof anchor === 'undefined') {
         return false;
@@ -1332,15 +1224,13 @@ var j1 = (function () {
         return false;
       }
 
-      scrollOffset    = j1.getScrollOffset();
-
       // Check if the anchor is an slider/gallery element
       if (typeof anchor !== 'undefined') {
-        isSlider  = anchor.includes('slide');
+        isSlider = anchor.includes('slide');
       }
 
       if (anchor_id && anchor_id !== '#' && !isSlider) {
-        // scroll only, if an anchor is given with URL
+        // scroll only, if an anchor is given with an URL
         selector = $(anchor_id);
         if (selector.length) {
           j1.core.scrollSmooth.scroll(anchor_id, {
@@ -1616,30 +1506,33 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     writeCookie: function (options /*name, data, [path, expires, domain, samesite, http_only, secure]*/) {
       var date                  = new Date();
-      var timestamp_now         = date.toISOString()
+      var timestamp_now         = date.toISOString();
       var url                   = new liteURL(window.location.href);
       var baseUrl               = url.origin;;
       var hostname              = url.hostname;
-      var domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
       var stringifiedAttributes = '';
       var cookie_data           = {};
       var data_json;
       var data_encoded;
-      var expires;
-      var domainAttribute;
 
       var defaults = {
-          data:         {},
-          name:         '',
-          path:         '{{cookie_options.path}}',
-          expires:      '{{cookie_options.expires}}',
-          domain:       '{{cookie_options.domain}}',
-          samesite:     '{{cookie_options.same_site}}',
-          http_only:    '{{cookie_options.http_only}}',
-          secure:       '{{cookie_options.secure}}'
+        path:         '{{cookie_options.path}}',
+        expires:      '{{cookie_options.expires}}',
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
+        samesite:     '{{cookie_options.same_site}}',
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
       var settings = $.extend(defaults, options);
 
+      // Failsafe: if 'None' is given for samesite in non-secure environments
+      // -----------------------------------------------------------------------
+      if (settings.samesite == 'None' && !settings.secure) {
+        settings.samesite = 'Lax';
+      }
+
       cookie_data.timestamp = timestamp_now;
 
       if (j1.existsCookie(settings.name)) {
@@ -1653,6 +1546,8 @@ var j1 = (function () {
         data_encoded  = window.btoa(data_json);
       }
 
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
       stringifiedAttributes += '; ' + 'Path=' + settings.path;
 
       if (settings.expires > 0) {
@@ -1663,20 +1558,25 @@ var j1 = (function () {
       stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
 
       // set domain used by cookies
-      if (settings.domain == 'auto') {
-        domainAttribute = domain;
-        stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
-      } else  {
-        domainAttribute = '';
-        stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
+      if (settings.domain) {
+        if (settings.domain == 'auto') {
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else {
+          stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
+        }
       }
 
-      if (settings.secure == 'true') {
-        stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
       }
 
       // write the cookie
-//    document.cookie = settings.name + '=' + content + '; path=' + settings.path + '; domain=' + settings.domain + '; ' + 'SameSite=' + settings.samesite + '; secure';
+      // -----------------------------------------------------------------------
       document.cookie = settings.name + '=' + data_encoded + stringifiedAttributes;
 
       if (j1.existsCookie(settings.name)) {
@@ -1684,14 +1584,13 @@ var j1 = (function () {
       } else {
         return false;
       }
-
     },
 
     // -------------------------------------------------------------------------
     // 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'
+    // Search for cookies (by name) in the page header that matches a given
+    // (name) string. A cookie name can be given 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
@@ -1707,29 +1606,51 @@ var j1 = (function () {
     // removeCookie (Vanilla JS)
     // -------------------------------------------------------------------------
     removeCookie: function (options /*name, [path, domain]*/) {
+      var url                   = new liteURL(window.location.href);
+      var baseUrl               = url.origin;;
+      var hostname              = url.hostname;
+      var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
+      var stringifiedAttributes = '';
+
       var defaults = {
         path:         '{{cookie_options.path}}',
-        expires:      '{{cookie_options.expires}}',
-        domain:       '{{cookie_options.domain}}',
+        expires:      'Thu, 01 Jan 1970 00:00:00 UTC',                          // clear cookies by settting the expiry date in the PAST
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
         samesite:     '{{cookie_options.same_site}}',
-        http_only:    '{{cookie_options.http_only}}',
-        secure:       '{{cookie_options.secure}}'
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
-      var cookieExists;
+      var settings  = $.extend(defaults, options);
 
-      var settings = $.extend(defaults, options);
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
+      stringifiedAttributes += '; ' + 'Path=' + settings.path;
+      stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+      stringifiedAttributes += '; ' + 'Expires=' + settings.expires;
 
       // set domain used by cookies
-      if (settings.domain == 'auto') {
-        domainAttribute = domain ;
-      } else  {
-        // domainAttribute = hostname;
-        domainAttribute = '';
+      if (settings.domain) {
+        if (settings.domain == 'auto') {
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else if (typeof settings.domain == 'string') {
+          stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
+        }
+      }
+
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
       }
 
+      // clear|remove the cookie if exists
+      // -----------------------------------------------------------------------
       if (j1.findCookie(settings.name)) {
-        // clear cookie CONTENT and set expiry date in the PAST
-        document.cookie = settings.name + '=; Domain=' + domainAttribute + '; Expires=Thu, 01 Jan 1970 00:00:00 UTC; Path=/;';
+        document.cookie = settings.name + '=;' + stringifiedAttributes;
         return true;
       } else {
         return false;
@@ -1744,49 +1665,71 @@ var j1 = (function () {
     // 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)
+    // expireCookie() returns 'true' if cookie is set successfully
+    // (to session), 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.
+    // to JavaScript. For that reason, attributes needs to be set explicitly
+    // to already KNOWN values.
+    //
     // -------------------------------------------------------------------------
     expireCookie: function (options /*name [,path, samesite, secure]*/) {
-      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 domainAttribute;
+      var url                   = new liteURL(window.location.href);
+      var baseUrl               = url.origin;;
+      var hostname              = url.hostname;
+      var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
+      var stringifiedAttributes = '';
 
       var defaults = {
         path:         '{{cookie_options.path}}',
         expires:      '{{cookie_options.expires}}',
-        domain:       '{{cookie_options.domain}}',
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
         samesite:     '{{cookie_options.same_site}}',
-        http_only:    '{{cookie_options.http_only}}',
-        secure:       '{{cookie_options.secure}}'
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
       var settings  = $.extend(defaults, options);
 
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
+      stringifiedAttributes += '; ' + 'Path=' + settings.path;
+      stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+
       // set domain used by cookies
-      if (settings.domain == 'auto') {
-        domainAttribute = domain ;
-      } else  {
-        // domainAttribute = hostname;
-        domainAttribute = '';
+      if (settings.domain) {
+        if (settings.domain == 'auto') {
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else if (typeof settings.domain == 'string') {
+          if (settings.domain !== 'false') {
+            stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
+          }
+        }
+      }
+
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
       }
 
-      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 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 "; "
@@ -1804,20 +1747,17 @@ var j1 = (function () {
         end = dc.indexOf(';', begin);
       }
 
-      // expire cookie to session
+      // write the cookie content, expire to session
+      // -----------------------------------------------------------------------
       content = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
-      if (settings.secure == 'true') {
-        document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; Secure' + '; ';
-      } else {
-        document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; ';
-      }
+      document.cookie = settings.name + '=' + content + stringifiedAttributes;
 
       return true;
     },
 
     // -------------------------------------------------------------------------
     // existsCookie (Vanilla JS)
-    // returns true if a given cookie exists
+    // returns true if a cookie of given name exists
     // -------------------------------------------------------------------------
     existsCookie: function (name) {
       var dc            = document.cookie;
@@ -1827,6 +1767,9 @@ var j1 = (function () {
       var cookieExists  = false;
       var cookieContent = '';
 
+      // collect the cookie content
+      // -----------------------------------------------------------------------
+
       // found, and not in first position
       if (begin !== -1) {
         // exclude the "; "
@@ -1844,6 +1787,8 @@ var j1 = (function () {
         end = dc.indexOf(';', begin);
       }
 
+      // check if the cookie exists
+      // -----------------------------------------------------------------------
       cookieContent = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
       cookieExists  = cookieContent.length ? true : false;