j1-template 2021.1.5 → 2021.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e93fb15ef56819b92a0d748c7e809c7381ac50e69868be5777ce21f01acf066
-  data.tar.gz: 2b710cb4d00181ee1b027fd6ea406a3e2c293a27cae544c3e72d5de055c43833
+  metadata.gz: a5ceecb6b421d85c3db86a44fba73d25650012ace9626b1a53ff082d16a61e9e
+  data.tar.gz: 7093783266335d7524f406c452bff71b8a9979f0b9d172c7025c01f9559ffc36
 SHA512:
-  metadata.gz: 88e8c900a10010e9bc600663c22fb7b0f0b292ea71e3bc700022519c3929cdec359b5af9d07bdfafd970fafd70933548fcc819e808a34acfe0b97ddd9ee8485a
-  data.tar.gz: 4edee51b60f67d1066729ef1fce3e1106cd957e9f06fbfbcfbd232aa7bcedb7d173af6955a516f76b52724f22f4d194227826b59083cfe15c752c0ea86f6a624
+  metadata.gz: a63666eeb929986759194324a01d601aec108c9f5f1716326668786779d84db989d97adfe02c40ef065faf54fb13743f900dca24e6934c4988e0c8110802ba3f
+  data.tar.gz: f702196b47569beb2d080ddcc75db8c4d4e7a3512a03d6bd291937d5a88167e7343dff4ac2a984978d269c42685b6766cb08ebca40aa74c0cbd35b3e63aa4183

data/assets/data/themes.json

@@ -47,18 +47,18 @@ regenerate:                             true
 {
   "themes":
   [
-    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.css"},
-    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.css"},
-    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.css"}
+    {"name": "Uno light", "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.css"},
+    {"name": "Uno dark",  "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.css"},
+    {"name": "Bootstrap", "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.css"}
   ]
 }
 {% else %}
 {
   "themes":
   [
-    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.min.css"},
-    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.min.css"},
-    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.min.css"}
+    {"name": "Uno light", "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.min.css"},
+    {"name": "Uno dark",  "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.min.css"},
+    {"name": "Bootstrap", "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.min.css"}
   ]
 }
 {% endif %}

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

@@ -34,6 +34,7 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_defaults    = modules.defaults.cookieconsent.defaults %}
 {% assign consent_settings    = modules.cookieconsent.settings %}
+{% assign tracking_enabled    = site.data.j1_config.analytics.enabled %}
 {% assign tracking_id         = site.data.j1_config.analytics.google.tracking_id %}
 
 {% comment %} Set config options
@@ -78,13 +79,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
   // ---------------------------------------------------------------------------
@@ -202,52 +210,70 @@ 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 user_state    = j1.readCookie('j1.user.state');
+      var user_consent  = j1.readCookie('j1.user.consent');
+      var json          = JSON.stringify(user_consent);
 
       logger.info('Entered post selection callback from CookieConsent');
       logger.info('Current values from CookieConsent: ' + json);
 
+      // NOTE: Warning needs to be moved to another module
+      // because page is reloaded after selection
+      //
+      if (tracking_enabled && !tracking_id_valid) {
+        logger.warn('tracking enabled, but invalid tracking id found: ' + tracking_id);
+      }
+
+      // for debugging
       // 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: '/'
+      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();
+          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');
       }
 
+      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'
+        });
+      }
+
       // reload page after selection
-      //
-      // $('#no_flicker').css('display', 'none');
       location.reload();
 
     } // END cbCookie

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

@@ -93,7 +93,6 @@ regenerate:                             true
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
  #  TODO:
- #    MANAGE themeExtensionCss is to be checked
  #
  # -----------------------------------------------------------------------------
  # Adapter generated: {{site.time}}
@@ -114,14 +113,14 @@ 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';
 
   var current_user_data;
   var current_page;
@@ -131,17 +130,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,19 +157,11 @@ 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  = [];
-
   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)
@@ -192,39 +183,24 @@ var j1 = (function () {
     '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,7 +217,6 @@ var j1 = (function () {
 
     // -------------------------------------------------------------------------
     // init()
-    // initializer
     // -------------------------------------------------------------------------
     init: function (options) {
 
@@ -251,15 +226,9 @@ var j1 = (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();
-
 
       // -----------------------------------------------------------------------
       // options loader
@@ -280,51 +249,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_names.user_state,
+            data:     user_state,
+            samesite: 'Strict'
+          });
+        } else {
           j1.writeCookie({
-            name: cookie_user_state_name,
-            data: user_state,
-            expires: 365
+            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 +308,38 @@ 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
-      });
+
+      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 +356,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 +396,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 +410,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 +425,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 +449,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 +468,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 +578,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 +681,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 +714,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 +735,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 +790,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;
@@ -863,14 +834,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()) {
@@ -934,17 +905,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 cc icon (currently NOT supported)
+          // $('#quickLinksControlCenterButton').css('display', 'block');
 
-          // show|hide cookie icon (should MOVED to Cookiebar ???)
+          // show|hide cookie icon
           if (j1.existsCookie(cookie_names.user_consent)) {
             // Display cookie icon
             logText = 'show cookie icon';
@@ -958,7 +933,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 +1026,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 +1043,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 +1122,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');
 
@@ -1295,21 +1263,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 +1290,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 +1670,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 +1810,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 +1857,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 %}