j1-template 2021.1.5 → 2021.1.10

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

@@ -28,13 +28,16 @@ regenerate:                             true
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
+{% assign blocks              = site.data.blocks %}
 {% assign modules             = site.data.modules %}
+{% assign template_config     = site.data.j1_config %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_defaults    = modules.defaults.cookieconsent.defaults %}
 {% assign consent_settings    = modules.cookieconsent.settings %}
-{% assign tracking_id         = site.data.j1_config.analytics.google.tracking_id %}
+{% assign tracking_enabled    = template_config.analytics.enabled %}
+{% assign tracking_id         = template_config.analytics.google.tracking_id %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -78,13 +81,20 @@ regenerate:                             true
 --------------------------------------------------------------- {% endcomment %}
 j1.adapter['cookieConsent'] = (function (j1, window) {
 
-  var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var environment       = '{{environment}}';
+  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 moduleOptions     = {};
   var _this;
   var $modal;
   var user_cookie;
   var logger;
   var logText;
+
+  // NOTE: RegEx for tracking_id: ^(G|UA|YT|MO)-[a-zA-Z0-9-]+$
+  // See: https://stackoverflow.com/questions/20411767/how-to-validate-google-analytics-tracking-id-using-a-javascript-function/20412153
+
   // ---------------------------------------------------------------------------
   // Helper functions
   // ---------------------------------------------------------------------------
@@ -130,31 +140,28 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // initializer
       // -----------------------------------------------------------------------
-      _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
-
-      j1.cookieConsent = new BootstrapCookieConsent({
-        contentURL:             moduleOptions.contentURL,
-        cookieName:             moduleOptions.cookieName,
-        language:               moduleOptions.language,
-        whitelisted:            moduleOptions.whitelisted,
-        reloadPageOnChange:     moduleOptions.reloadCurrentPage,
-        xhr_data_element:       moduleOptions.xhr_data_element + '-' + moduleOptions.language,
-        postSelectionCallback:  function () {
-            j1.adapter.cookieConsent.cbCookie()
-        }
-      });
-
       var dependencies_met_page_ready = setInterval (function (options) {
-        if ( j1.cookieConsent && j1.getState() === 'finished' ) {
+        if ( j1.getState() === 'finished' ) {
+          _this.setState('started');
+          logger.info('state: ' + _this.getState());
+          logger.info('module is being initialized');
+
+          j1.cookieConsent = new BootstrapCookieConsent({
+            contentURL:             moduleOptions.contentURL,
+            cookieName:             moduleOptions.cookieName,
+            language:               moduleOptions.language,
+            whitelisted:            moduleOptions.whitelisted,
+            reloadPageOnChange:     moduleOptions.reloadPageOnChange,
+            xhr_data_element:       moduleOptions.xhr_data_element + '-' + moduleOptions.language,
+            postSelectionCallback:  function () {j1.adapter.cookieConsent.cbCookie()}
+          });
+
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
           logger.debug('module initialized successfully');
           clearInterval(dependencies_met_page_ready);
         }
       });
-
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -202,53 +209,83 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // cbCookie()
-    // Callback function called by CookieConsent module after the user has
-    // made his selection
-    // -------------------------------------------------------------------------
-    // TODO:
-    // If ONLY required setting selected, make j1.user.consent
-    // a SESSION cookie!!!
+    // Called by CookieConsent module after the user has
+    // made his selection (callback)
     // -------------------------------------------------------------------------
     cbCookie: function () {
-      var gaCookies     = j1.findCookie('_ga');
-      var user_cookie   = j1.readCookie('j1.user.consent');
-      var json          = JSON.stringify(user_cookie);
+      var gaCookies           = j1.findCookie('_ga');
+      var user_state          = j1.readCookie('j1.user.state');
+      var user_consent        = j1.readCookie('j1.user.consent');
+      var json                = JSON.stringify(user_consent);
+      var user_agent          = platform.ua;
 
       logger.info('Entered post selection callback from CookieConsent');
       logger.info('Current values from CookieConsent: ' + json);
 
-      // gaCookies.forEach(item => console.log('cookieConsent: ' + item));
-
-      // Manage Google Analytics OptIn/Out
-      // See: https://github.com/luciomartinez/gtag-opt-in/wiki
-      //
-      GTagOptIn.register('{{tracking_id}}');
-      if (user_cookie.analyses)  {
-        logger.info('Enable: GA');
-        GTagOptIn.optIn();
-      } else {
-        logger.warn('Disable: GA');
-        GTagOptIn.optOut();
-        var gaCookies = j1.findCookie('_ga');
-        gaCookies.forEach(function (item) {
-          logger.warn('Delete GA cookie: ' + item);
-          j1.removeCookie({
-            name: item,
-            path: '/'
-          });
-        });
-      }
-
       // enable cookie button if not visible
-      //
       if ($('#quickLinksCookieButton').css('display') === 'none')  {
         $('#quickLinksCookieButton').css('display', 'block');
       }
 
-      // reload page after selection
+      // jadams, 2021-07-11: moded to j1 adapter (displayPage)
       //
-      // $('#no_flicker').css('display', 'none');
-      location.reload();
+      // NOTE: Warning needs to be moved to another module
+      // because page is reloaded after selection
+      //
+      // if (tracking_enabled && !tracking_id_valid) {
+      //   logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+      // } else {
+      //   logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+      // }
+
+      // for development only
+      if (environment === 'development') {
+        gaCookies.forEach(item => console.log('cookieConsent: ' + item));
+      }
+
+      if (user_agent.includes('iPad'))  {
+        logger.warn('Product detected : ' + platform.product);
+        logger.warn('Skip deleting (unwanted) cookies for this platform');
+      }
+
+      // Manage Google Analytics OptIn/Out
+      // See: https://github.com/luciomartinez/gtag-opt-in/wiki
+      if (tracking_enabled && tracking_id_valid) {
+        GTagOptIn.register(tracking_id);
+        if (user_consent.analyses)  {
+          logger.info('Enable: GA');
+          GTagOptIn.optIn();
+        } else {
+          logger.warn('Disable: GA');
+          GTagOptIn.optOut();
+
+          if (!user_agent.includes('iPad')) {
+            gaCookies.forEach(function (item) {
+              logger.warn('Delete GA cookie: ' + item);
+              j1.removeCookie({name: item, path: '/'});
+            });
+          }
+        }
+
+        if (!user_consent.analyses || !user_consent.personalization)  {
+          // expire consent|state cookies to session
+          j1.writeCookie({
+            name:     'j1.user.state',
+            data:     user_state,
+            samesite: 'Strict'
+          });
+          j1.writeCookie({
+            name:     'j1.user.consent',
+            data:     user_consent,
+            samesite: 'Strict'
+          });
+        }
+
+        if (moduleOptions.reloadPageOnChange)  {
+          // reload current page (skip cache)
+          location.reload(true);
+        }
+      } // END if tracking_enabled
 
     } // END cbCookie
 

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

@@ -393,7 +393,8 @@ j1.adapter['fam'] = (function (j1, window) {
     // reload page
     // -------------------------------------------------------------------------
     reload_page: function () {
-      location.reload();
+      // reload current page (skip cache)
+      location.reload(true);
     }, // END reload_page
 
     // -------------------------------------------------------------------------

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 %}
@@ -93,7 +95,6 @@ regenerate:                             true
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
  #  TODO:
- #    MANAGE themeExtensionCss is to be checked
  #
  # -----------------------------------------------------------------------------
  # Adapter generated: {{site.time}}
@@ -114,14 +115,19 @@ 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';
+
+  // Tracking information (GA)
+  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 current_user_data;
   var current_page;
@@ -131,17 +137,17 @@ var j1 = (function () {
   var app_detected;
   var user_session_detected;
 
-  // Connector settings
-  var translation_enabled       = {{template_config.translation.enabled}};
+  // Translatior settings (currently NOT supported)
+  // var translation_enabled       = {{template_config.translation.enabled}};
 
   // Theme information
   var themeName;
   var themeCss;
-  var themeExtensionCss         = environment === 'production'
-                                  ? '/assets/themes/j1/core/css/themes/theme-extensions.min.css'
-                                  : '/assets/themes/j1/core/css/themes/theme-extensions.css';
+  var cssExtension              = (environment === 'production')
+                                  ? '.min.css'
+                                  : '.css';
 
-  // Pathes of J1 data files
+   // Pathes of J1 data files
   var colors_data_path          = '{{template_config.colors_data_path}}';
   var font_size_data_path       = '{{template_config.font_size_data_path}}';
   var runtime_data_path         = '{{template_config.runtime_data_path}}';
@@ -158,22 +164,13 @@ var j1 = (function () {
   var baseUrl;
   var referrer;
 
-  // var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css' : '/assets/themes/j1/core/css/themes/uno-light/bootstrap.css';
-  // // TODO: check what property is used default_theme|default_theme_name ?
-  // var default_theme_display_name  = 'Uno (light)';
-  // var default_theme_name          = 'uno-light';
-  // var default_theme_author        = 'J1 Team';
-  // var default_theme_link          = 'https://jekyll.one/';
-  // var default_white_listed_pages  = [];
-
+  // initial cookie values
   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': 'j1.user.consent'
+    'user_consent': '{{template_config.cookies.user_consent}}'
   };
-
-  // user SESSION cookie (initial values)
   var user_session = {
     'mode':                 'web',
     'writer':               'web',
@@ -191,40 +188,23 @@ var j1 = (function () {
     'previous_page':        'na',
     'last_pager':           '/pages/public/blog/navigator/'
   };
-
-  // user STATE cookie (initial values)
-  // var user_state = {
-  //   'theme_css':            "",
-  //   'theme_name':           "",
-  //   'theme_author':         "",
-  //   'theme_version':        '{{site.version}}',
-  //   'cookies_accepted':     'pending',
-  //   'whitelistedPages':     default_white_listed_pages,
-  //   'deleteOnDecline':      false,
-  //   'showConsentOnPending': false,
-  //   'stopScrolling':        true,
-  //   'session_active':       false,
-  //   'last_session_ts':      '',
-  //   'cc_authenticated':     false
-  // };
-
   var user_state = {
-    'theme_css':            "",
-    'theme_name':           "",
-    'theme_author':         "",
+    'theme_css':            '',
+    'theme_name':           '',
+    'theme_author':         '',
     'theme_version':        '{{site.version}}',
-    'stopScrolling':        true,
     'session_active':       false,
     'last_session_ts':      ''
   };
+  var user_consent = {};
 
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
 
+  // See: https://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string
+  //
   function executeFunctionByName(functionName, context /*, args */) {
-    // See: https://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string
-    //
     var args = Array.prototype.slice.call(arguments, 2);
     var namespaces = functionName.split('.');
     var func = namespaces.pop();
@@ -241,25 +221,18 @@ var j1 = (function () {
 
     // -------------------------------------------------------------------------
     // init()
-    // initializer
     // -------------------------------------------------------------------------
     init: function (options) {
 
       // -----------------------------------------------------------------------
       // global var (function)
       // -----------------------------------------------------------------------
-      var logger        = log4javascript.getLogger('j1.init');
-      var url           = new liteURL(window.location.href);
-      var baseUrl       = url.origin;
-//    moment not used anymore
-//    var epoch         = Math.floor(Date.now()/1000);
-//    var timestamp_now = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
-      var date          = new Date();
-      var timestamp_now = date.toISOString();
-      var curr_state    = 'started';
-      // var date          = new Date();
-      // var my_timestamp  = date.toISOString();
-
+      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';
 
       // -----------------------------------------------------------------------
       // options loader
@@ -280,51 +253,58 @@ var j1 = (function () {
       j1['xhrDOMState']  = {};
 
       // -----------------------------------------------------------------------
-      // session ON_CLOSE event
-      // wrapup if ALL browser windows get closed. Update user STATE
-      // cookie on window CLOSE.
+      // update cookies if browser window get closed
       // see: https://stackoverflow.com/questions/3888902/detect-browser-or-tab-closing
       // -----------------------------------------------------------------------
       window.addEventListener('beforeunload', function (event) {
         var cookie_names              = j1.getCookieNames();
-        var cookie_user_state_name    = cookie_names.user_state;
-        var cookie_user_session_name  = cookie_names.user_session;
-//      moment not used anymore
-//      var epoch                     = Math.floor(Date.now()/1000);
-//      var timestamp_now             = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
         var date                      = new Date();
         var timestamp_now             = date.toISOString();
-        var user_state                = j1.readCookie(cookie_user_state_name);
+        var user_state                = j1.readCookie(cookie_names.user_state);
+        var user_consent              = j1.readCookie(cookie_names.user_consent);
         var ep_status;
         var url;
         var baseUrl;
 
-        // update cookie only, if (already) exists
-        //
-        if (user_state) {
-          user_state.session_active     = false;
-          user_state.last_session_ts    = timestamp_now;
+        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_user_state_name,
-            data: user_state,
-            expires: 365
+            name:     cookie_names.user_state,
+            data:     user_state,
+            samesite: 'Strict'
+          });
+        } else {
+          j1.writeCookie({
+            name:     cookie_names.user_state,
+            data:     user_state,
+            samesite: 'Strict',
+            expires:  365
           });
         }
 
-      });
+      }); // END beforeunload
 
       // -----------------------------------------------------------------------
-      // initialize|load (existing) user cookies
+      // initialize|load user cookies
       // -----------------------------------------------------------------------
       user_session.created    = timestamp_now;
       user_session.timestamp  = timestamp_now;
 
+      user_consent  = j1.readCookie(cookie_names.user_consent);
       user_session  =  j1.existsCookie(cookie_names.user_session)
                         ? j1.readCookie(cookie_names.user_session)
                         : j1.writeCookie({
                             name:     cookie_names.user_session,
                             data:     user_session,
+                            samesite: 'Strict'
                           });
 
       user_state    =  j1.existsCookie(cookie_names.user_state)
@@ -332,27 +312,46 @@ var j1 = (function () {
                         : j1.writeCookie({
                             name:     cookie_names.user_state,
                             data:     user_state,
+                            samesite: 'Strict',
                             expires:  365
                           });
 
-      user_state.session_active = true;
-      j1.writeCookie({
-        name:     cookie_names.user_state,
-        data:     user_state,
-        expires:  365
-      });
+      // 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.warn('user session cookie NOT found');
+        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({
+          name:     cookie_names.user_state,
+          data:     user_state,
+          samesite: 'Strict'
+        });
+      } else {
+        j1.writeCookie({
+          name:     cookie_names.user_state,
+          data:     user_state,
+          samesite: 'Strict',
+          expires:  365
+        });
+      }
 
       // detect middleware (mode 'app') and update user session cookie
       // -----------------------------------------------------------------------
-      // if (user_session.mode === 'na' || user_session.mode === 'app') {
       if (user_session.mode === 'app') {
         var url           = new liteURL(window.location.href);
         var ep_status     = baseUrl + '/status' + '?page=' + window.location.pathname;
         var detectTimeout =  50;
 
-        baseUrl       = url.origin;
+        baseUrl = url.origin;
 
-        // see: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
+        // See: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
         $.when (
           $.ajax(ep_status)
         )
@@ -369,14 +368,12 @@ var j1 = (function () {
           logger.info('update user session cookie');
           j1.writeCookie({
             name:     cookie_names.user_session,
-            data:     user_session
+            data:     user_session,
+            samesite: 'Strict'
           });
           j1.setState(curr_state);
           logger.info('state: ' + j1.getState());
 
-
-
-
           var dependencies_met_page_displayed = setInterval (function () {
             if (j1.getState() == 'finished') {
               if (j1.authEnabled()) {
@@ -411,8 +408,9 @@ var j1 = (function () {
 
             logger.info(logText);
             j1.writeCookie({
-              name: cookie_names.user_session,
-              data: user_session
+              name:     cookie_names.user_session,
+              data:     user_session,
+              samesite: 'Strict'
             });
             j1.setState(curr_state);
             logger.info('state: ' + j1.getState());
@@ -424,10 +422,6 @@ var j1 = (function () {
         logger.info('page is being initialized');
       }
 
-      // jadams: for testing only
-      // display page
-      // $('#no_flicker').css('display', 'block');
-
       state = 'started';
       logger.info('state: ' + state);
       logger.info('page is being initialized');
@@ -443,7 +437,6 @@ var j1 = (function () {
       // process|update user state cookie
       themeName                 = user_session.theme_name;
       themeCss                  = user_session.theme_css;
-      themeExtensionCss         = user_session.theme_extension_css;
 
       // save last page access
       // see: https://stackoverflow.com/questions/3528324/how-to-get-the-previous-url-in-javascript
@@ -468,18 +461,15 @@ var j1 = (function () {
         last_pager                = user_session.last_pager;
       }
 
-      // jadams: for testing only
-      // display page
-      //$('#no_flicker').css('display', 'block');
-
       logger.info('update user session cookie');
       j1.writeCookie({
-        name: cookie_names.user_session,
-        data: user_session
+        name:     cookie_names.user_session,
+        data:     user_session,
+        samesite: 'Strict'
       });
 
+      // NOTE: asynchronous calls should be rewitten to xhrData
       // initialize page resources for blocks
-      // (asynchronous, should be rewitten to xhrData)
       j1.initBanner(settings);
       j1.initPanel(settings);
       j1.initFooter(settings);
@@ -490,8 +480,9 @@ var j1 = (function () {
 
       user_session.timestamp = timestamp_now;
       j1.writeCookie({
-        name: cookie_names.user_session,
-        data: user_session
+        name:     cookie_names.user_session,
+        data:     user_session,
+        samesite: 'Strict'
       });
 
       // -----------------------------------------------------------------------
@@ -599,7 +590,6 @@ var j1 = (function () {
           if (selector.length) {
             logText = 'loading banner on id: ' +banner[i];
             logger.info(logText);
-//          var banner_data_path = '{{banner_data_path}} ' + id + ' > *';
             var banner_data_path = '{{banner_data_path}} ' + id;
             selector.load(banner_data_path, cb_load_closure(id));
           }
@@ -703,7 +693,6 @@ var j1 = (function () {
           if ( selector.length ) {
             logText = 'loading panel on id: ' +panel[i];
             logger.info(logText);
-//          var panel_data_path = '{{panel_data_path}} ' + id + ' > *';
             var panel_data_path = '{{panel_data_path}} ' + id;
             selector.load(panel_data_path, cb_load_closure(id));
           }
@@ -737,12 +726,6 @@ var j1 = (function () {
             j1.setXhrDataState(footer_id, statusTxt);
             j1.setXhrDomState(footer_id, statusTxt);
             logger.info('XHR data loaded in the DOM: ' + footer_id);
-
-            // jadams, 2020-07-21: intermediate state DISABLED
-            // state = 'footer_loaded';
-            // logger.info('set state for module ' + mod + ': ' + state);
-            // executeFunctionByName(mod + '.setState', window, state);
-
             logText = 'initialization finished';
             logger.info(logText);
           }
@@ -764,7 +747,6 @@ var j1 = (function () {
       var id = '#' + '{{footer_id}}';
       var selector = $(id);
       if ( selector.length ) {
-//      var footer_data_path = '{{footer_data_path}} ' + id + ' > *';
         var footer_data_path = '{{footer_data_path}} ' + id;
         selector.load(footer_data_path, cb_load_closure(id));
       } else {
@@ -820,7 +802,8 @@ var j1 = (function () {
           user_session.current_page = current_url.pathname;
           j1.writeCookie({
             name:     cookie_names.user_session,
-            data:     user_session
+            data:     user_session,
+            samesite: 'Strict'
           });
 
           providerPermissions = user_session.provider_permissions;
@@ -850,6 +833,15 @@ var j1 = (function () {
             // display page
             $('#no_flicker').css('display', 'block');
 
+            // NOTE: Placed tracking warning/info here because page may reloaded
+            // after cookie consent selection
+            //
+            if (tracking_enabled && !tracking_id_valid) {
+              logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+            } else {
+              logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+            }
+
             // show|hide cookie icon (should MOVED to Cookiebar ???)
             if (j1.existsCookie(cookie_names.user_consent)) {
               // Display cookie icon
@@ -863,14 +855,14 @@ var j1 = (function () {
               $('#quickLinksCookieButton').css('display', 'none');
             }
 
-            // show|hide translator icon
-            if (translation_enabled) {
-              logger.info('translator detected: google');
-              logger.info('initialize language selector');
-              $('.goog-te-combo').addClass('form-control');
-            }
+            // show|hide translator icon (currently NOT supported)
+            // if (translation_enabled) {
+            //   logger.info('translator detected: google');
+            //   logger.info('initialize language selector');
+            //   $('.goog-te-combo').addClass('form-control');
+            // }
 
-            // show cc icon
+            // show cc icon (currently NOT supported)
             // $('#quickLinksControlCenterButton').css('display', 'block');
 
             if (j1.authEnabled()) {
@@ -927,6 +919,15 @@ var j1 = (function () {
           // display page
           $('#no_flicker').css('display', 'block');
 
+          // NOTE: Placed tracking warning/info here because page may reloaded
+          // after cookie consent selection
+          //
+          if (tracking_enabled && !tracking_id_valid) {
+            logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+          } else {
+            logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+          }
+
           logger.info('mode detected: web');
           logger.info('hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
@@ -934,17 +935,21 @@ var j1 = (function () {
           user_session.current_page = current_url.pathname;
           j1.writeCookie({
               name:     cookie_names.user_session,
-              data:     user_session
+              data:     user_session,
+              samesite: 'Strict'
           });
 
-          // show|hide translator icon
-          if (translation_enabled) {
-            logger.info('translator detected: google');
-            logger.info('initialize language selector');
-            $('.goog-te-combo').addClass('form-control');
-          }
+          // show|hide translator icon (currently NOT supported)
+          // if (translation_enabled) {
+          //   logger.info('translator detected: google');
+          //   logger.info('initialize language selector');
+          //   $('.goog-te-combo').addClass('form-control');
+          // }
 
-          // show|hide cookie icon (should MOVED to Cookiebar ???)
+          // show cc icon (currently NOT supported)
+          // $('#quickLinksControlCenterButton').css('display', 'block');
+
+          // show|hide cookie icon
           if (j1.existsCookie(cookie_names.user_consent)) {
             // Display cookie icon
             logText = 'show cookie icon';
@@ -958,7 +963,7 @@ var j1 = (function () {
           }
 
           // If the page requested contains an anchor element,
-          // do a smooth scroll to
+          // do a smooth scroll
           j1.scrollTo();
 
           if (user_session.previous_page !== user_session.current_page) {
@@ -1051,7 +1056,6 @@ var j1 = (function () {
       var toccerScrollOffset   = {{toccer_options.scrollSmoothOffset}};
 
       // calculate offset for correct (smooth) scroll position
-      //
       var $pagehead       = $('.attic');
       var $navbar         = $('nav.navbar');
       var $adblock        = $('#adblock');
@@ -1069,7 +1073,6 @@ var j1 = (function () {
       var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
 
       // static offset, to be checked why this is needed
-      //
       scrollOffset        = scrollOffset + toccerScrollOffset;
 
       if (anchor_id && anchor_id !== '#') {
@@ -1149,11 +1152,6 @@ var j1 = (function () {
         return function (responseTxt, statusTxt, xhr) {
           var logger = log4javascript.getLogger('j1.adapter.xhrData');
           if ( statusTxt === 'success' ) {
-            // jadams, 2020-07-21: intermediate state should DISABLED
-            // if (state) {
-            //   logger.info('set state for ' +mod+ ' to: ' + state);
-            //   executeFunctionByName(mod + '.setState', window, state);
-            // }
             j1.setXhrDataState(id, statusTxt);
             j1.setXhrDomState(id, 'pending');
 
@@ -1180,19 +1178,24 @@ var j1 = (function () {
 
       // see: https://stackoverflow.com/questions/20420577/detect-added-element-to-dom-with-mutation-observer
       //
-      var html_data_path;
+      var html_data_path = options.xhr_data_path + ' #' + options.xhr_data_element;
       var id        = '#' + options.xhr_container_id;
       var container = '#' + options.xhr_container_id + '_container';
       var $selector = $(id);
 
+      // NOTE: Unclear why some pages (e.g. about/site) affected (fam button).
+      // All pages should have FRONTMATTER defaults (by _config.yml) setting
+      // all relevant defaults.
+
+      // failsafe - prevent XHR load errors
+      if (options.xhr_data_element !== '') {
+        logger.info('XHR data element found: ' + options.xhr_data_element);
+      } else  {
+        logger.warn('no XHR data element found, loading data aborted');
+        return;
+      }
+
       if ( $selector.length ) {
-        if (options.xhr_data_element) {
-          html_data_path = options.xhr_data_path + ' #' + options.xhr_data_element;
-          logger.info('XHR data element found: ' + options.xhr_data_element);
-        } else  {
-          logger.warn('no XHR data element found. HTML data loaded full page.');
-          html_data_path = options.xhr_data_path + ' > *';
-        }
         $selector.load( html_data_path, cb_load_closure( mod, id ) );
 
         var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
@@ -1205,7 +1208,7 @@ var j1 = (function () {
 
         selector.each(function(){
             xhrObserver.observe(this, obsConfig);
-        } );
+        });
 
         function mutationHandler (mutationRecords) {
           mutationRecords.forEach ( function (mutation) {
@@ -1217,6 +1220,8 @@ var j1 = (function () {
         }
       } 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;
           logger.warn(logText);
@@ -1295,21 +1300,17 @@ var j1 = (function () {
     //    context/HTTPS).
     // -------------------------------------------------------------------------
     //
-    writeCookie: function (options /*name, data, [path, expires, SameSite, secure]*/) {
+    writeCookie: function (options /*name, data, [path, expires, samesite, http_only, secure]*/) {
       var defaults = {
           data: {},
           name: '',
-          expires: 0,
           path: '/',
-//        SameSite: 'Strict',
-//        SameSite: 'Lax',
+          expires: 0,
+          samesite: 'Lax',
           http_only: false,
           secure: false
       };
       var settings = $.extend(defaults, options);
-//    moment not used anymore
-//    var epoch         = Math.floor(Date.now()/1000);
-//    var timestamp_now = moment.unix(epoch).format('YYYY-MM-DD HH:mm:ss');
       var date          = new Date();
       var timestamp_now = date.toISOString();
       var cookie_data   = {};
@@ -1326,25 +1327,26 @@ var j1 = (function () {
         if (settings.expires > 0) {
           Cookies.set(settings.name, data_encoded, {
             expires: settings.expires,
-            SameSite: settings.SameSite
+            SameSite: settings.samesite
           });
         } else {
           Cookies.set(settings.name, data_encoded, {
-          SameSite: settings.SameSite
+          SameSite: settings.samesite
           });
         }
       } 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
+            SameSite: settings.samesite
           });
         } else {
           Cookies.set(settings.name, data_encoded, {
-            SameSite: settings.SameSite
+            SameSite: settings.samesite
           });
         }
       }
@@ -1705,12 +1707,6 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       $('head').append('<style>.g-bg-primary { background-color: ' +bg_primary+ ' !important; }</style>');
 
-      // Set color of timeline bullet
-      // -----------------------------------------------------------------------
-      // $('head').append('<style>.tmicon { background: ' +bg_primary+ ' !important; }</style>');
-      // $('head').append('<style>.timeline-panel:after { border-left-color: ' +bg_primary+ ' !important; }</style>');
-      // $('head').append('<style>.timeline-panel:after { border-right-color: ' +bg_primary+ ' !important; }</style>');
-
       // mdi icons
       // -----------------------------------------------------------------------
       $('head').append('<style>.iconify-md-bg-primary { color: ' +bg_primary+ ' !important; }</style>');
@@ -1851,7 +1847,7 @@ var j1 = (function () {
      for ( var i = 0; i < length; i++ ) {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
      }
-   return result;
+     return result;
     }, // END generateId
 
     // -------------------------------------------------------------------------
@@ -1898,10 +1894,20 @@ var j1 = (function () {
   }; // END j1 (return)
 }) (j1, window);
 
-{% endcapture %}
+{% comment %} NOTE: Unexpected token: punc (;) errors if compressed
+--------------------------------------------------------------------------------
 {% if production %}
   {{ cache | minifyJS }}
 {% else %}
   {{ cache | strip_empty_lines }}
 {% endif %}
 {% assign cache = nil %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% endcapture %}
+{% if production %}
+  {{ cache | strip_empty_lines }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}