j1-template 2022.0.9 → 2022.0.10

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

@@ -0,0 +1,416 @@
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/advertising.js
+ # Liquid template to adapt advertising plugin
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ #  advertising_options:  {{ advertising_options | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookie_defaults      = modules.defaults.cookies.defaults %}
+{% assign cookie_settings      = modules.cookies.settings %}
+{% assign advertising_defaults = modules.defaults.advertising.defaults %}
+{% assign advertising_settings = modules.advertising.settings %}
+
+{% comment %} Set config options (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookie_options       = cookie_defaults | merge: cookie_settings %}
+{% assign advertising_options  = advertising_defaults | merge: advertising_settings %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign advertising           = advertising_options.enabled %}
+{% assign advertising_provider  = advertising_options.provider %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/advertising.js
+ # J1 Adapter for advertising
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+j1.adapter['advertising'] = (function (j1, window) {
+
+{% comment %} Set global variables
+-------------------------------------------------------------------------------- {% endcomment %}
+var environment             = '{{environment}}';
+var gadScript               = document.createElement('script');
+var adInitializerScript     = document.createElement('script');
+var autoHideOnUnfilled      = {{advertising_options.google.autoHideOnUnfilled}};
+var addBorderOnUnfilled     = {{advertising_options.google.addBorderOnUnfilled}};
+var checkTrackingProtection = {{advertising_options.google.checkTrackingProtection}};
+var showErrorPageOnBlocked  = {{advertising_options.google.showErrorPageOnBlocked}};
+var adInitializerScriptText;
+var tracking_protection;
+var url;
+var baseUrl;
+var hostname;
+var cookie_names;
+var user_consent;
+var domain;
+var domainAttribute;
+var cookie_option_domain;
+var cookie_domain;
+var _this;
+var logger;
+var logText;
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // init()
+    // adapter initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+    {% if advertising %}
+      // [INFO   ] [j1.adapter.advertising                  ] [ detected advertising provider (j1_config): {{advertising_provider}}} ]
+      // [INFO   ] [j1.adapter.advertising                  ] [ start processing load region head, layout: {{page.layout}} ]
+
+      cookie_names          = j1.getCookieNames();
+      user_consent          = j1.readCookie(cookie_names.user_consent);
+      url                   = new liteURL(window.location.href);
+      baseUrl               = url.origin;
+      hostname              = url.hostname;
+      domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      cookie_option_domain  = '{{cookie_options.domain}}';
+
+      // set domain used by cookies
+      if (cookie_option_domain == 'auto') {
+        domainAttribute = domain ;
+      } else  {
+        domainAttribute = hostname;
+      }
+
+      {% case advertising_provider %}
+      {% when "google" %}
+      // [INFO   ] [j1.adapter.advertising                  ] [ place provider: Google Adsense ]
+      _this = j1.adapter.advertising;
+      logger = log4javascript.getLogger('j1.adapter.advertising.google');
+      // initialize state flag
+      _this.setState('started');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
+      // default module settings
+      var settings = $.extend({
+        module_name: 'j1.adapter.advertising',
+        generated:   '2021-12-18 18:55:38 +0000'
+      }, options);
+
+      var dependencies_met_page_ready = setInterval(function() {
+        if (j1.getState() == 'finished') {
+          if (user_consent.personalization) {
+            // place all ads configured for the page
+            // NOTE: currently NOT implemented/used
+            // -----------------------------------------------------------------
+            // _this.place_ads();
+
+            // add gad api dynamically in the head section
+            // -----------------------------------------------------------------
+            logger.info('\n' + 'add gad api dynamically in section: head');
+            gadScript.async = true;
+            gadScript.id    = 'gad-api';
+            gadScript.src   = '//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js';
+            gadScript.setAttribute('data-ad-client', 'ca-pub-3885670015316130');
+            document.head.appendChild(gadScript);
+
+            // setup monitor for state changes on all ads configured
+            // ---------------------------------------------------------------
+            logger.info('\n' + 'setup monitoring');
+            _this.monitor_ads();
+
+            // run protection check
+            // -------------------------------------------------------------------
+            if (checkTrackingProtection) {
+              logger.info('\n' + 'run checks for tracking protection');
+              _this.check_tracking_protection();
+
+              var dependencies_met_tracking_check_ready = setInterval (function (options) {
+                if (typeof tracking_protection !== 'undefined' ) {
+
+                  var browser_tracking_feature = navigator.DoNotTrack;
+
+                  if (!tracking_protection && !browser_tracking_feature) {
+                    logText = '\n' + 'tracking protection: disabled';
+                    logger.info(logText);
+                  } else {
+                    logText = '\n' + 'tracking protection: enabled';
+                    logger.warn(logText);
+
+                    if (showErrorPageOnBlocked) {
+                      logger.error('\n' + 'redirect to error page (blocked content): HTML-447');
+                      // redirect to error page: blocked content
+                      window.location.href = '/447.html';
+                    }
+                  }
+                }
+                clearInterval(dependencies_met_tracking_check_ready);
+              }, 25);
+            } else {
+              // setup monitor for state changes on all ads configured
+              // ---------------------------------------------------------------
+              logger.info('\n' + 'setup monitoring');
+              _this.monitor_ads();
+
+              _this.setState('finished');
+              logger.info('\n' + 'state: ' + _this.getState());
+              logger.info('\n' + 'module initialized successfully');
+              clearInterval(dependencies_met_tracking_check_ready);
+            }
+            clearInterval(dependencies_met_page_ready);
+          } else {
+            var gaCookies  = j1.findCookie('_ga');
+            logger.warn('\n' + 'consent on cookies disabled for personalization');
+            logger.warn('\n' + 'initialization of module advertising skipped');
+
+            // jadams, 2021-12-19: remove cookies on invalid GAD config
+            // or left cookies from previous session
+            // -----------------------------------------------------------------
+            j1.removeCookie({ name: '__gads' });
+
+            // jadams, 2021-12-19: delete cookies in loop doesn't work
+            // gaCookies.forEach(function (item) {
+            //   logger.warn('\n' + 'delete GAD cookie: ' + item);
+            //   // j1.removeCookie({ name: item, domain: domainAttribute });
+            //   // j1.removeCookie({ name: item });
+            // });
+
+            if (checkTrackingProtection) {
+              if (!user_consent.personalization) {
+                logText = '\n' + 'consent on cookies disabled for personalization';
+                logger.warn(logText);
+
+                if (showErrorPageOnBlocked) {
+                  logger.error('\n' + 'redirect to error page (blocked content): HTML-447');
+                  // redirect to error page: blocked content
+                  window.location.href = '/448.html';
+                }
+              }
+            }
+            clearInterval(dependencies_met_page_ready);
+          } // END if user_consent.personalization
+        } // END if getState 'finished'
+      }, 25);
+
+      {% when "custom" %}
+      // [INFO   ] [j1.adapter.advertising                  ] [ place provider: Custom Provider ]
+      {% endcase %}
+      // [INFO   ] [j1.adapter.advertising                  ] [ end processing ]
+      {% else %}
+      var dependencies_met_page_ready = setInterval(function() {
+        if (j1.getState() == 'finished') {
+          var ads_found = document.getElementsByClassName('adsbygoogle').length;
+          logger = log4javascript.getLogger('j1.adapter.advertising.google');
+          logger.warn('\n' + 'found ads in page: #' + ads_found);
+          logger.warn('\n' + 'no ads initialized, advertising disabled');
+          clearInterval(dependencies_met_page_ready);
+        }
+      }, 25);
+      {% endif %}
+      return;
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // monitor_ads()
+    // monitor for state changes on the ad
+    // -------------------------------------------------------------------------
+    monitor_ads: function () {
+
+      $('.adsbygoogle').attrchange({
+        trackValues: true,
+        callback: function (event) {
+          if (event.newValue === 'unfilled') {
+            var elm = event.target.dataset;
+            if (addBorderOnUnfilled) { $('.adsbygoogle').addClass('border--dotted'); }
+            if (elm.adClient) {
+              logger.warn('\n' + 'found ad state ' + event.newValue + ' for slot: ' + elm.adSlot);
+              if (autoHideOnUnfilled) {
+                logger.warn('\n' + ' hide ad for slot: ' + elm.adSlot);
+                $('#' + elm.adSlot ).hide();
+              }
+            }
+          }
+        }
+      });
+    },
+
+    // -------------------------------------------------------------------------
+    // check_tracking_protection()
+    // detect if a user is using tracking protection
+    // NOTE:
+    // Firefox uses a list obtained from 'https://disconnect.me/trackerprotection'
+    // for its tracking protection. The checker use an image loaded from a
+    // domain that is on that list (facebook.com), and an image that will
+    // exist (tracking pixel).
+    //
+    // See for more details:
+    //  https://stackoverflow.com/questions/33959324/how-to-detect-if-a-user-is-using-tracking-protection-in-firefox-42
+    // -------------------------------------------------------------------------
+    check_tracking_protection: function () {
+      var logger = log4javascript.getLogger('j1.adapter.advertising.tracking.monitor');
+
+      logText = '\n' + 'check for trackingprotection';
+      logger.info(logText);
+
+      function checkTrackingProtection() {
+        if (!checkTrackingProtection.promise) {
+          checkTrackingProtection.promise = new Promise(function(resolve, reject) {
+
+            var time = Date.now();
+            var img = new Image();
+            img.onload = resolve;
+            img.onerror = function() {
+              if ((Date.now() - time) < 50) {
+                reject(new Error("Rejected."));
+              } else {
+                resolve(new Error("Takes too long."));
+              }
+            };
+            img.src = '//www.facebook.com/tr/';
+          }).then((result) => {
+            tracking_protection = false;
+          }).catch(e => {
+            tracking_protection = true;
+            logger.debug('\n' + 'detection details: ' + e);
+          });
+        }
+      }
+      checkTrackingProtection();
+    }, // END check_tracking_protection
+
+    // -------------------------------------------------------------------------
+    // place_ads()
+    // place ads configured|enabled
+    // -------------------------------------------------------------------------
+    place_ads: function () {
+
+      logText = '\n' + 'ads are being placed';
+      logger.info(logText);
+
+      // START loadig ads
+      var dependencies_met_page_ready = setInterval (function (options) {
+        if (j1.getState() === 'finished') {
+
+          {% comment %} See loop for loading elements with adapter/scroller.js
+          ---------------------------------------------------------------------- {% endcomment %}
+          clearInterval(dependencies_met_page_ready);
+
+        }
+      });
+      // END place ads
+    },
+
+    // -------------------------------------------------------------------------
+    // messageHandler()
+    // manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info('\n' + message.text);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    } // END getState
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -211,7 +211,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
 
           clearInterval(dependencies_met_page_ready);
         }
-      });
+      }, 25);
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -342,9 +342,14 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
       } else {
         // jadams, 2021-08-10: remove cookies on invalid GA config or left
         // cookies from previous session if they exists
+        // ---------------------------------------------------------------------
         gaCookies.forEach(function (item) {
-          logger.warn('\n' + 'delete GA cookie: ' + item);
-          j1.removeCookie({ name: item, domain: cookie_domain });
+          // Skip cookies from Google Ads
+          var gad = item.includes('gad');
+          if (!gad) {
+            logger.warn('\n' + 'delete GA cookie: ' + item);
+            j1.removeCookie({ name: item, domain: cookie_domain });
+          }
         });
 
         // Managing providers using personalization OptIn/Out

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

@@ -164,12 +164,9 @@ j1.adapter['framer'] = (function (j1, window) {
             logger.info('\n' + 'initializing module finished');
 
             clearInterval(dependencies_met_page_finished);
-
             return true;
-
         }
       }, 25);
-
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -1054,6 +1054,7 @@ var j1 = (function () {
 
             // Set|Log status
             state = 'finished';
+            j1.setState(state);
             logText = '\n' + 'state: ' + state;
             logger.info(logText);
             logText = '\n' + 'page finalized successfully';
@@ -1063,7 +1064,7 @@ var j1 = (function () {
       } else {
         // web mode
         setTimeout (function() {
-          j1.setState('finished');
+          // j1.setState('finished');
           logger.info('\n' + 'state: finished');
           logger.info('\n' + 'page initialization: finished');
 
@@ -1224,8 +1225,9 @@ var j1 = (function () {
           current_user_data = j1.mergeData(user_session, user_state);
           j1.core.navigator.updateSidebar(current_user_data);
 
-          // set|log status
+          // Set|Log status
           state = 'finished';
+          j1.setState(state);
           logText = '\n' + 'state: ' + state;
           logger.info(logText);
           logText = '\n' + 'page finalized successfully';
@@ -1707,6 +1709,8 @@ var j1 = (function () {
     // removeCookie (Vanilla JS)
     // -------------------------------------------------------------------------
     removeCookie: function (options /*name, [path, domain]*/) {
+      var domainAttribute;
+
       var defaults = {
         path:         '{{cookie_options.path}}',
         expires:      '{{cookie_options.expires}}',

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

@@ -146,7 +146,7 @@ j1.adapter['rouge'] = (function (j1, window) {
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
          $('.dropdown-menu a').click(function(){
-            $('#selected').html("Current Selection: <div class='bg-primary mt-1 p-2'>"+$(this).text()+"</div>");
+            $('#selected-theme').html('Current selection: <div class="md-gray-900 mt-1 p-2" style="background-color: #BDBDBD; font-weight: 700;">' +$(this).text() + '</div>');
          });
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());

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

@@ -226,7 +226,7 @@ var lastPageInfo;
 
           clearInterval(dependencies_met_page_ready);
         }
-      });
+      }, 25);
       // END generate scrollers
     },
 

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

@@ -246,25 +246,25 @@ j1.adapter['translator'] = (function (j1, window) {
           domainAttribute = '';
         }
 
-        // load|initialize user translate cookie
-        if (j1.existsCookie(cookie_names.user_translate)) {
-          user_translate = j1.readCookie(cookie_names.user_translate);
-        } else {
-          logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
-          cookie_written = j1.writeCookie({
-            name:     cookie_names.user_translate,
-            data:     user_translate,
-            samesite: same_site,
-            secure:   secure,
-            expires:  expires
-          });
-        }
-
         if ( j1.getState() === 'finished' ) {
           _this.setState('started');
           logger.info('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
+          // load|initialize user translate cookie
+          if (j1.existsCookie(cookie_names.user_translate)) {
+            user_translate = j1.readCookie(cookie_names.user_translate);
+          } else {
+            logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
+            cookie_written = j1.writeCookie({
+              name:     cookie_names.user_translate,
+              data:     user_translate,
+              samesite: same_site,
+              secure:   secure,
+              expires:  expires
+            });
+          }
+
           // hide the google translate element if exists
           if ($('google_translate_element')) {
             $('google_translate_element').hide();
@@ -359,7 +359,7 @@ j1.adapter['translator'] = (function (j1, window) {
 
           clearInterval(dependencies_met_page_ready);
         }
-      });
+      }, 25);
     }, // END init
 
     // -------------------------------------------------------------------------

data/assets/themes/j1/core/css/themes/unolight/bootstrap.css

@@ -19278,6 +19278,12 @@ a.timeline-list-unstyled:hover {
 .hide {
   display: none; }
 
+.border--solid {
+  border: 1px solid #616161; }
+
+.border--dotted {
+  border: 1px dotted #616161; }
+
 .g-color-white-opacity-0_6, .g-color-white-opacity-0_6--hover:hover {
   color: rgba(255, 255, 255, 0.6) !important; }