j1-template 2022.0.13 → 2022.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1cafe13f11508c2bba1a30585af76cd2cf2ed917c746dfcdf12f646792b981
-  data.tar.gz: 06c239b5297206fde2f28b3f21046712a2f7beca6c8e8111583e2d50339aee0c
+  metadata.gz: 8b82f66a38e834f8d58482cd5b873f110de6474e2e0af3a644721b9b55cbbbaf
+  data.tar.gz: 9a611fe54f09585e29a1a355b4ff630d391cc627b86c5e15498244f276e152b4
 SHA512:
-  metadata.gz: 3ece2178ed2e520a8d842411b9000ba5b95f3fe8f2c57aa97b0c568eddde3f5df6ab6533cead28d1ecb4ad560d11d2a5808ce8c6f4e5c1d6caf391811ea18b87
-  data.tar.gz: 3e5b29d8ee062cfc81dacccd6f74db3180878fbe3d22f41060256f4275b66c5dc640a500a8a2128663591fb5aed72fa3a1ab2b86c9ebec361518bc6649a78784
+  metadata.gz: 2fcefcb4ef9cf86a75550e6155e6ad2607e5b11d8ac693bcd338a932c2ae964b15444b4c19b3803a6d0cc2d1676b979557c834678f7b44f71054ebfd80d57d43
+  data.tar.gz: 0bfed9014849a89820b08932378689492530212dcae7588530389f8bcd1f2af1bb75f2a56e6b3f89d730137e9edd218d43698743f64ae2295e2264e43cd61ae9

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

@@ -111,11 +111,6 @@ var _this;
 var logger;
 var logText;
 
-// var domain;
-// var domainAttribute;
-// var cookie_option_domain;
-// var cookie_domain;
-
   // ---------------------------------------------------------------------------
   // Main object
   // ---------------------------------------------------------------------------
@@ -147,16 +142,6 @@ var logText;
       url                   = new liteURL(window.location.href);
       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 ]
@@ -176,7 +161,7 @@ var logText;
           advertisingProvider = 'Google Adsense';
           validProviderID = (providerID.includes('your')) ? false : true;
           if (!validProviderID) {
-            logger.warn('\n' + 'invalid publisherID detected for Google Adsense: ' + providerID);
+            logger.warn('\n' + 'invalid publisherID detected for Google Adsense (GAS): ' + providerID);
             logger.info('\n' + 'skip initialization for provider: ' + advertisingProvider);
             clearInterval(dependencies_met_page_ready);
             return false;
@@ -190,22 +175,22 @@ var logText;
 
             // add gad api dynamically in the head section
             // -----------------------------------------------------------------
-            logger.info('\n' + 'add gad api dynamically in section: head');
+            logger.info('\n' + 'add gas api in section: head');
             gadScript.async = true;
-            gadScript.id    = 'gad-api';
+            gadScript.id    = 'gas-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');
+            logger.debug('\n' + 'setup monitoring');
             _this.monitor_ads();
 
             // run protection check
             // -------------------------------------------------------------------
             if (checkTrackingProtection) {
-              logger.info('\n' + 'run checks for tracking protection');
+              logger.debug('\n' + 'run checks for tracking protection');
               _this.check_tracking_protection();
 
               var dependencies_met_tracking_check_ready = setInterval (function (options) {
@@ -300,20 +285,27 @@ var logText;
     // -------------------------------------------------------------------------
     // monitor_ads()
     // monitor for state changes on the ad placed in pages (if any)
+    //
+    // NOTE: Check visibility state of the adSlot to prevent multiple
+    // processing of the same slot
     // -------------------------------------------------------------------------
     monitor_ads: function () {
+      var logger = log4javascript.getLogger('j1.adapter.advertising.monitor.ads');
 
       $('.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();
+            var elm             = event.target.dataset;
+            var adSlotIsVisible = $('#' + elm.adSlot ).is(":visible");
+            if (adSlotIsVisible) {
+              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();
+                }
               }
             }
           }
@@ -334,7 +326,7 @@ var logText;
     //  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');
+      var logger = log4javascript.getLogger('j1.adapter.advertising.monitor.tracking');
 
       logText = '\n' + 'check for trackingprotection';
       logger.info(logText);

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

@@ -192,8 +192,9 @@ j1.adapter.cookieConsent = (function (j1, window) {
           }
         }
 
-        // Failsafe: if 'None' is given for samesite in non-secure environments
-        // -----------------------------------------------------------------------
+        // Failsafe: if 'None' is given for samesite in non-secure
+        // environments open access to cookies to subdomains
+        // ---------------------------------------------------------------------
         if (same_site == 'None' && !secure) {
           same_site = 'Lax';
         }

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

@@ -273,7 +273,6 @@ var j1 = (function () {
       var timestamp_now     = date.toISOString();
       var curr_state        = 'started';
       var gaCookies         = j1.findCookie('_ga');
-      var j1Cookies         = j1.findCookie('j1');
       var themerOptions     = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
       // -----------------------------------------------------------------------
@@ -346,17 +345,6 @@ var j1 = (function () {
                             expires:  365
                           });
 
-      // jadams, 2021-12-06: Check if access to cookies for this site failed.
-      // Possibly, a third-party domain or an attacker tries to access it.
-      if (checkCookies) {
-        if (!user_state) {
-          logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
-          logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
-          // redirect to error page: blocked content
-          window.location.href = '/446.html';
-        }
-      }
-
       if (!user_consent.analysis || !user_consent.personalization)  {
         if (expireCookiesOnRequiredOnly) {
           // expire permanent cookies to session
@@ -902,6 +890,20 @@ var j1 = (function () {
             // display page
             $('#no_flicker').css('display', 'block');
 
+            // jadams, 2021-12-06: Check if access to cookies for this site failed.
+            // Possibly, a third-party domain or an attacker tries to access it.
+            if (checkCookies) {
+              var j1Cookies = j1.findCookie('j1');
+              if (!j1.existsCookie(cookie_names.user_state)) {
+                logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
+                logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+                // redirect to error page: blocked content
+                window.location.href = '/446.html';
+              } else {
+                logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+              }
+            }
+
             // manage Dropcaps if translation is enabled|disabled
             // -----------------------------------------------------------------
             if (user_translate.translationEnabled) {
@@ -1008,6 +1010,20 @@ var j1 = (function () {
           // display the page loaded
           $('#no_flicker').css('display', 'block');
 
+          // jadams, 2021-12-06: Check if access to cookies for this site failed.
+          // Possibly, a third-party domain or an attacker tries to access it.
+          if (checkCookies) {
+            var j1Cookies = j1.findCookie('j1');
+            if (!j1.existsCookie(cookie_names.user_state)) {
+              logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
+              logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+              // redirect to error page: blocked content
+              window.location.href = '/446.html';
+            } else {
+              logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+            }
+          }
+
           // jadams, 2021-11-19: test code for 'tapTarget' of 'materializeCss'
           // See:
           //  https://stackoverflow.com/questions/49422111/opening-tap-target-in-materialize-css-for-2-seconds

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2022.0.13'
+  VERSION = '2022.0.14'
 end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2022.0.13'
+gem 'j1-template', '~> 2022.0.14'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2022.0.13
+version:                                2022.0.14
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/advertising.yml

@@ -32,14 +32,6 @@ settings:
   # ----------------------------------------------------------------------------
   # Settings
   #
-  #   enabled
-  #   --------------------------------------------------------------------------
-  #   Enables or disables the Ad services. If disabled, no ads services are
-  #   enabled and no unit container get initialized on any page.
-  #
-  #   values:                           [true|false]
-  #   default:                          false
-  #
   #   provider
   #   --------------------------------------------------------------------------
   #   Currently, only Google adsense (google) is available as an provider
@@ -50,8 +42,6 @@ settings:
   #
   # ----------------------------------------------------------------------------
   #
-  enabled:                              false
-
   google:
 
     # --------------------------------------------------------------------------

data/lib/starter_web/_data/modules/cookies.yml

@@ -26,5 +26,10 @@ description:
 settings:
   enabled:                              true
 
+  # ----------------------------------------------------------------------------
+  # Switches
+  # ----------------------------------------------------------------------------
+  checkCookies:                         true
+  
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/defaults/advertising.yml

@@ -34,11 +34,12 @@ defaults:
   #
   #   enabled
   #   --------------------------------------------------------------------------
-  #   Enables or disables the Ad services. If disabled, no ads services are
-  #   enabled and no unit container get initialized on any page.
+  #   Enables or disables the Ad services. If disabled, ad services is NOT
+  #   initialized and no unit container get initialized on any page even the
+  #   module is loaded.
   #
   #   values:                           [true|false]
-  #   default:                          false
+  #   default:                          true
   #
   #   provider
   #   --------------------------------------------------------------------------
@@ -50,13 +51,12 @@ defaults:
   #
   # ----------------------------------------------------------------------------
   #
-  enabled:                              false
-
+  enabled:                              true
   provider:                             google
-  google:
 
+  google:
     # --------------------------------------------------------------------------
-    # Provider settings
+    # Provider settings (Google)
     #
     #   publisherID
     #   ------------------------------------------------------------------------

data/lib/starter_web/_data/modules/defaults/cookies.yml

@@ -35,15 +35,17 @@ defaults:
   #
   #   checkCookies
   #   --------------------------------------------------------------------------
-  #   Check if cookies are created and available to the browser. If the cookie
-  #   attributes does NOT allow to create and|or access on cookies,
-  #   setting-up a page will fail. It is recommended to enable checks on
-  #   cookies to issue an error page (HTML 445) if access on cookies has
-  #   failed for some reason. This will prevent severe failures and|or endless
-  #   loops accessing a page on missing cookies or invalid cookie settings.
+  #   Check if cookies are created and available to the browser. If the
+  #   cookie attributes does NOT allow to create and|or access on cookies,
+  #   setting-up a page will fail.
+  #   For testing sites deplayed on the Internet, it is recommended to enable
+  #   checks on cookies to issue an error page (HTML 445) if access on cookies
+  #   has failed for some reason. This will prevent severe failures and|or
+  #   endless loops accessing a page on missing cookies or invalid cookie
+  #   settings.
   #
   #   values:                           [false|true]
-  #   default:                          true
+  #   default:                          false
   #
   #   encryptCookiesOnHttp (currently NOT supported)
   #   --------------------------------------------------------------------------
@@ -95,7 +97,7 @@ defaults:
   #
   # ----------------------------------------------------------------------------
   #
-  checkCookies:                         true
+  checkCookies:                         false
   encryptCookiesOnHttp:                 false
   expireCookiesOnRequiredOnly:          true
 

data/lib/starter_web/_includes/attributes.asciidoc

@@ -437,7 +437,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2022.0.13
+:j1--version:                                     2022.0.14
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2022.0.13'
+    VERSION = '2022.0.14'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2022.0.13",
+  "version": "2022.0.14",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/000_intro.adoc

@@ -21,7 +21,7 @@ robots:
 permalink:                              /pages/public/skeleton/documentation/000_intro/
 regenerate:                             false
 
-resources:                              []
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    4

data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/100_converter.adoc

@@ -10,7 +10,7 @@ tags:                                   [ Asciidoctor, PDF, Converter ]
 permalink:                              /pages/public/skeleton/documentation/100_converter/
 regenerate:                             false
 
-resources:                              [ animate, lightbox, clipboard, rouge ]
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    2

data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/200_themes.adoc

@@ -9,7 +9,7 @@ tags:                                   [ Asciidoctor, PDF, Converter ]
 permalink:                              /pages/public/skeleton/documentation/200_themes/
 regenerate:                             false
 
-resources:                              [ animate, lightbox, clipboard, rouge ]
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    2

data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/documentation.adoc

@@ -14,9 +14,6 @@ description: >
 categories:                             [ Knowledge ]
 tags:                                   [ Asciidoc, Skeleton, Documentation, PDF ]
 
-sitemap:                                false
-comments:                               false
-
 robots:
   index:                                false
   follow:                               false
@@ -24,7 +21,7 @@ robots:
 permalink:                              /pages/public/skeleton/documentation/
 regenerate:                             false
 
-resources:                              [ clipboard, lightbox, rouge, animate ]
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    4

data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/multi.adoc

@@ -12,9 +12,6 @@ description: >
 categories:                             [ Knowledge ]
 tags:                                   [ Asciidoc, Skeleton, Document ]
 
-sitemap:                                false
-comments:                               false
-
 robots:
   index:                                false
   follow:                               false
@@ -22,7 +19,7 @@ robots:
 permalink:                              /pages/public/skeleton/multi/
 regenerate:                             false
 
-resources:                              [ lightbox, clipboard, rouge, animate ]
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    4

data/lib/starter_web/pages/public/asciidoc_skeletons/simple-document/simple.adoc

@@ -11,9 +11,6 @@ description: >
 categories:                             [ Knowledge ]
 tags:                                   [ Asciidoc, Skeleton, Document ]
 
-sitemap:                                false
-comments:                               false
-
 robots:
   index:                                false
   follow:                               false
@@ -21,7 +18,7 @@ robots:
 permalink:                              /pages/public/skeleton/simple/
 regenerate:                             false
 
-resources:                              [ clipboard, rouge, animate ]
+resources:                              [ animate, clipboard, lightbox, rouge ]
 resource_options:
   - toccer:
       collapseDepth:                    4

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.13",
+  "version": "2022.0.14",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.13",
+  "version": "2022.0.14",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2022.0.13
+  version: 2022.0.14
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll