j1-template 2021.1.12 → 2021.1.17

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

@@ -121,8 +121,8 @@ j1.adapter['attic'] = (function (j1, window) {
       _this['frontmatterOptions'] = frontmatterOptions;
 
       _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
 
       _this.loadHeader(frontmatterOptions);
     }, // END init
@@ -183,7 +183,7 @@ j1.adapter['attic'] = (function (j1, window) {
             -------------------------------------------------------------------- {% endcomment %}
            $(window).on('backstretch.before', function (e, instance, index) {
               _this.setState('backstretch_before');
-              logger.debug('state: ' + _this.getState());
+              logger.debug('\n' + 'state: ' + _this.getState());
             });
 
             {% comment %} Add a caption (c) or badge (b) if configured
@@ -192,8 +192,8 @@ j1.adapter['attic'] = (function (j1, window) {
             $(window).on('backstretch.after', function (e, instance, index) {
               logText ='add caption text';
               _this.setState('backstretch_after');
-              logger.debug('state: ' + status);
-              logger.debug(logText);
+              logger.debug('\n' + 'state: ' + status);
+              // logger.debug(logText);
 
               if (typeof atticOptions.slides[index].caption != 'undefined') {
                 var cText = atticOptions.slides[index].caption.text;
@@ -233,8 +233,8 @@ j1.adapter['attic'] = (function (j1, window) {
                 }
               }
               _this.setState('finished');
-              logger.info('state: ' + _this.getState());
-              logger.info('module initialized successfully');
+              logger.info('\n' + 'state: ' + _this.getState());
+              logger.info('\n' + 'module initialized successfully');
             });
 
             {% comment %} Detect how show should run (only once|infinite loop)
@@ -242,7 +242,7 @@ j1.adapter['attic'] = (function (j1, window) {
             {% if image_loop %}
             $(window).on('backstretch.before', function (e, instance, index) {
               _this.setState('backstretch_before_image_loop');
-              logger.debug('state: ' + _this.getState());
+              logger.debug('\n' + 'state: ' + _this.getState());
               // remove class for the backstretch_intro background
               if (index === backstretch_instance_data.images.length -1) {
                 $('.backstretch').removeClass(atticOptions.spinner);
@@ -251,7 +251,7 @@ j1.adapter['attic'] = (function (j1, window) {
             {% else %}
             $(window).on('backstretch.before', function (e, instance, index) {
               _this.setState('backstretch_before_image_once');
-              logger.debug('state: ' + _this.getState());
+              logger.debug('\n' + 'state: ' + _this.getState());
               // Stop the slideshow after reached the last image
               if (index === backstretch_instance_data.images.length -1) {
                 $('#{{attic_id}}').backstretch('pause');
@@ -494,18 +494,18 @@ j1.adapter['attic'] = (function (j1, window) {
             $('head').append(attic_opacity);
 
             _this.setState('initialized');
-            logger.info('state: ' + _this.getState());
+            logger.info('\n' + 'state: ' + _this.getState());
 
             {% comment %} Run the image header if any
             -------------------------------------------------------------------- {% endcomment %}
             if (typeof atticOptions.slides != 'undefined') {
               // Load the image header if the page is ready (visible)
               $(function() {
-                // logger.debug('Load image header on: ' + {{attic_id}});
-                logger.debug('Load image header');
+                // logger.debug('\n' + 'Load image header on: ' + {{attic_id}});
+                logger.debug('\n' + 'Load image header');
                 {{attic_id}}(atticOptions);
                 _this.setState('completed');
-                logger.info('state: ' + _this.getState());
+                logger.info('\n' + 'state: ' + _this.getState());
               });
             }
           } // END if header id found in page
@@ -515,8 +515,8 @@ j1.adapter['attic'] = (function (j1, window) {
       // NO header found in page
       if ($('#no_header').length) {
         _this.setState('completed');
-        logger.info('state: ' + _this.getState());
-        logger.warn('No header configured or found in page');
+        logger.info('\n' + 'state: ' + _this.getState());
+        logger.warn('\n' + 'no header configured or found in page');
       }
 
       return true;
@@ -529,7 +529,7 @@ j1.adapter['attic'] = (function (j1, window) {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -537,7 +537,7 @@ j1.adapter['attic'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
         status = 'completed';
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //

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

@@ -79,8 +79,8 @@ j1.adapter['bmd'] = (function (j1, window) {
 
       // initialize state flag
       _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -93,7 +93,7 @@ j1.adapter['bmd'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // BMD initializer
       // -----------------------------------------------------------------------
-      var log_text = 'BMD is being initialized';
+      var log_text = '\n' + 'BMD is being initialized';
       logger.info(log_text);
 
       var dependencies_met_j1_finished = setInterval(function() {
@@ -101,7 +101,7 @@ j1.adapter['bmd'] = (function (j1, window) {
           $('body').bootstrapMaterialDesign();
 
           _this.setState('finished');
-          logger.info('state: ' + _this.getState());
+          logger.info('\n' + 'state: ' + _this.getState());
 
           clearInterval(dependencies_met_j1_finished);
         } // END dependencies_met_j1_finished
@@ -116,7 +116,7 @@ j1.adapter['bmd'] = (function (j1, window) {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -126,7 +126,7 @@ j1.adapter['bmd'] = (function (j1, window) {
         //
         // Place handling of command|action here
         //
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //

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

@@ -131,8 +131,8 @@ j1.adapter['carousel'] = (function (j1, window) {
       }
 
       _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
 
       var dependencies_met_page_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
@@ -157,11 +157,11 @@ j1.adapter['carousel'] = (function (j1, window) {
               if ($('#{{slider_id}}').length) {
 
                 {% if environment == 'development' %}
-                  logText = 'slider is being initialized on id: #{{slider_id}}';
+                  logText = '\n' + 'slider is being initialized on id: #{{slider_id}}';
                   logger.info(logText);
                   _this.setState('running');
-                  logger.info('state: ' + _this.getState());
-                  logger.info('module is being initialized');
+                  logger.info('\n' + 'state: ' + _this.getState());
+                  logger.info('\n' + 'module is being initialized');
                 {% endif %}
 
                 {% if item.show.slide_height != null %}
@@ -336,7 +336,7 @@ j1.adapter['carousel'] = (function (j1, window) {
                     {% endif %}
                   }
                   $('#{{slider_id}}').html(content);
-                  logText = 'initializing slider finished on id: {{slider_id}}';
+                  logText = '\n' + 'initializing slider finished on id: {{slider_id}}';
                   logger.info(logText);
                 } // END customDataSuccess_{{forloop.index}}
               } // END if carousel exists
@@ -345,8 +345,8 @@ j1.adapter['carousel'] = (function (j1, window) {
           clearInterval(dependencies_met_page_finished);
         }
         _this.setState('finished');
-        logger.info('state: ' + _this.getState());
-        logger.info('initializing module finished');
+        logger.info('\n' + 'state: ' + _this.getState());
+        logger.info('\n' + 'initializing module finished');
       }, 25); // END 'dependencies_met_adapter_finished'
     }, // END init
 
@@ -357,7 +357,7 @@ j1.adapter['carousel'] = (function (j1, window) {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -367,7 +367,7 @@ j1.adapter['carousel'] = (function (j1, window) {
         //
         // Place handling of command|action here
         //
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //

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

@@ -101,13 +101,13 @@ j1.adapter['clipboard'] = (function (j1, window) {
 
       // initialize state flag
       _this.state = 'started';
-      logText = 'initialization: started';
+      logText = '\n' + 'initialization: started';
       logger.info(logText);
 
       // initialize ClipboardJS if page is loaded
       var dependencies_met_j1_finished = setInterval(function() {
         if ( j1.getState() == 'finished' ) {
-          logText = 'create clipboard';
+          logText = '\n' + 'create clipboard';
           logger.info(logText);
 
           clipboardJS = new ClipboardJS('.btn-clipboard', {
@@ -120,10 +120,10 @@ j1.adapter['clipboard'] = (function (j1, window) {
           _this.initEventHandler(clipboardJS);
 
           clearInterval(dependencies_met_j1_finished);
-          logger.info('met dependencies for: j1');
+          logger.info('\n' + 'met dependencies for: j1');
           _this.setState('finished');
-          logger.info('state: ' + _this.getState());
-          logger.info('module initialized successfully');
+          logger.info('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module initialized successfully');
         }
       }, 25); // END dependencies_met_j1_finished
     },
@@ -154,7 +154,7 @@ j1.adapter['clipboard'] = (function (j1, window) {
       clipboard.on('success', function (e) {
         $(e.trigger).attr('title', 'copied!').tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
         var logger = log4javascript.getLogger('j1.initClipboard');
-        var logText = 'initialization copy-to-clipboard sucessfull';
+        var logText = '\n' + 'initialization copy-to-clipboard sucessfull';
         logger.debug(logText);
         /* Cleanup clipped data for trailing numbers */
         var splitted = e.text.split('\n');
@@ -168,7 +168,7 @@ j1.adapter['clipboard'] = (function (j1, window) {
       clipboard.on('error', function (e) {
         var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'press \u2318 to copy' : 'press ctrl-c to copy';
         logger = log4javascript.getLogger('j1.initClipboard');
-        logText = 'initialization copy-to-clipboard failed, fallback used.';
+        logText = '\n' + 'initialization copy-to-clipboard failed, fallback used.';
         logger.warn(logText);
         $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'copy to clipboard').tooltip('_fixTitle');
       });
@@ -182,7 +182,7 @@ j1.adapter['clipboard'] = (function (j1, window) {
       // var json_message = JSON.stringify(message, undefined, 2);              // multiline
       var json_message = JSON.stringify(message);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -192,10 +192,10 @@ j1.adapter['clipboard'] = (function (j1, window) {
         //
         // Place handling of command|action here
         //
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
       if (message.type === 'command' && message.action === 'status') {
-        logger.info('messageHandler: received - ' + message.action);
+        logger.info('\n' + 'messageHandler: received - ' + message.action);
       }
 
       //

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

@@ -39,6 +39,8 @@ regenerate:                             true
 {% assign tracking_enabled    = template_config.analytics.enabled %}
 {% assign tracking_id         = template_config.analytics.google.tracking_id %}
 
+{% assign comment_provider    = site.data.j1_config.comments.provider %}
+
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign consent_options     = consent_defaults | merge: consent_settings %}
@@ -78,20 +80,28 @@ regenerate:                             true
 'use strict';
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 j1.adapter['cookieConsent'] = (function (j1, window) {
 
   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 comment_provider  = '{{comment_provider}}';
   var moduleOptions     = {};
   var _this;
   var $modal;
   var user_cookie;
   var logger;
+  var url;
+  var baseUrl;
+  var hostname;
+  var domain;
+  var cookie_domain;
+  var secure;
   var logText;
   var cookie_written;
+  var language;
 
   // 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
@@ -113,8 +123,21 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this   = j1.adapter.cookieConsent;
-      logger  = log4javascript.getLogger('j1.adapter.cookieConsent');
+      _this         = j1.adapter.cookieConsent;
+      logger        = log4javascript.getLogger('j1.adapter.cookieConsent');
+      url           = new liteURL(window.location.href);
+      baseUrl       = url.origin;
+      hostname      = url.hostname;
+      domain        = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      secure        = (url.protocol.includes('https')) ? true : false;
+      language      = "{{site.language}}";
+
+      // set domain used by cookies
+      if(domain !== 'localhost') {
+        cookie_domain = '.' + hostname;
+      } else {
+        cookie_domain = hostname;
+      }
 
       // initialize state flag
       _this.state = 'pending';
@@ -144,23 +167,24 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       var dependencies_met_page_ready = setInterval (function (options) {
         if ( j1.getState() === 'finished' ) {
           _this.setState('started');
-          logger.info('state: ' + _this.getState());
-          logger.info('module is being initialized');
+          logger.info('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
 
           j1.cookieConsent = new BootstrapCookieConsent({
             contentURL:             moduleOptions.contentURL,
             cookieName:             moduleOptions.cookieName,
-            language:               moduleOptions.language,
+            language:               language,
             whitelisted:            moduleOptions.whitelisted,
             reloadPageOnChange:     moduleOptions.reloadPageOnChange,
-            xhr_data_element:       moduleOptions.xhr_data_element + '-' + moduleOptions.language,
+            xhr_data_element:       moduleOptions.xhr_data_element + '-' + language,
             sameSite:               moduleOptions.sameSite,
+            secure:                 secure,
             postSelectionCallback:  function () {j1.adapter.cookieConsent.cbCookie()}
           });
 
           _this.setState('finished');
-          logger.info('state: ' + _this.getState());
-          logger.debug('module initialized successfully');
+          logger.info('\n' + 'state: ' + _this.getState());
+          logger.debug('\n' + 'module initialized successfully');
           clearInterval(dependencies_met_page_ready);
         }
       });
@@ -173,7 +197,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);
 
-      logText = 'received message from ' + sender + ': ' + json_message;
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
       // -----------------------------------------------------------------------
@@ -183,7 +207,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
         //
         // Place handling of command|action here
         //
-        logger.info(message.text);
+        logger.info('\n' + message.text);
       }
 
       //
@@ -223,8 +247,8 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       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);
+      logger.info('\n' + 'entered post selection callback from CookieConsent');
+      logger.info('\n' + 'current values from CookieConsent: ' + json);
 
       // enable cookie button if not visible
       if ($('#quickLinksCookieButton').css('display') === 'none')  {
@@ -236,20 +260,19 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       // because page is reloaded after selection
       //
       // if (tracking_enabled && !tracking_id_valid) {
-      //   logger.error('tracking enabled, but invalid tracking id found: ' + tracking_id);
+      //   logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
       // } else {
-      //   logger.warn('tracking enabled, tracking id found: ' + tracking_id);
+      //   logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
       // }
 
-      // for development only
-      if (environment === 'development') {
-        gaCookies.forEach(item => console.log('cookieConsent: ' + item));
-        j1Cookies.forEach(item => console.log('cookieConsent: ' + item));
-      }
+      logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
+      j1Cookies.forEach(item => console.log('j1.core.switcher: ' + item));
+      logger.debug('\n' + 'ga cookies found:' + gaCookies.length);
+      gaCookies.forEach(item => console.log('j1.core.switcher: ' + item));
 
       if (user_agent.includes('iPad'))  {
-        logger.warn('Product detected : ' + platform.product);
-        logger.warn('Skip deleting (unwanted) cookies for this platform');
+        logger.warn('\n' + 'product detected : ' + platform.product);
+        logger.warn('\n' + 'skip deleting (unwanted) cookies for this platform');
       }
 
       // Manage Google Analytics OptIn/Out
@@ -257,20 +280,24 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       if (tracking_enabled && tracking_id_valid) {
         GTagOptIn.register(tracking_id);
         if (user_consent.analyses)  {
-          logger.info('Enable: GA');
+          logger.info('\n' + 'enable: GA');
           GTagOptIn.optIn();
         } else {
-          logger.warn('Disable: GA');
+          logger.warn('\n' + 'disable: GA');
           GTagOptIn.optOut();
 
           if (!user_agent.includes('iPad')) {
             gaCookies.forEach(function (item) {
-              logger.warn('Delete GA cookie: ' + item);
-              j1.removeCookie(item);
+              logger.warn('\n' + 'delete GA cookie: ' + item);
+              j1.removeCookie({ name: item, domain: cookie_domain });
             });
           }
         }
-        if (!user_consent.analyses || !user_consent.personalization)  {
+
+        // Managing providers for personalization OptIn/Out (Comments|Ads)
+        // moved to J1 adapter
+
+        if (!user_consent.analyses || !user_consent.personalization) {
           // expire consent|state cookies to session
           j1.expireCookie({ name: cookie_names.user_state });
           j1.expireCookie({ name: cookie_names.user_consent });