j1-template 2023.0.13 → 2023.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecc33a0450cd03fb2a36a3627288ca5fa977a0df8cf3ac4b557c0e528bad5e5
-  data.tar.gz: a9a4db6417dac407e5fbddd8b05af2c25aedce85cbaf3f0471fd0e9e2ffa1c06
+  metadata.gz: d0d5cb7aeb15733944dff7b5d830e913c156fdf7cc515f3101153ec65665dbec
+  data.tar.gz: f9de89b7fcea2a7360fdd69666b945ccfa5fecd8fb00d1c29c30253c6a9b46bf
 SHA512:
-  metadata.gz: 834c99140ff627c372c30c2c4da726e3a03bb560dc39438d23dcb8ff71fc3547b38d007a942582d3273b5d7f91cfb84b6daf3d87f421c211c640556990264862
-  data.tar.gz: baed3e32d701124db08ade0d26156d2f24dd74c6029a8656b395749a882ff95d9f444427991e9f024f48177604bfd71594f6929941b44305e102a997db4549d7
+  metadata.gz: 1979b9be4e118573f4c23cdd2d3cf2133dbcdbb4df75d2cc4fda37456d8ea7f7c41b65d0b3fdf8b44462e088624dd81451cf9d203d077bc9c95df36c2f2da47c
+  data.tar.gz: 207b6680b87bd6eb2935796379fa36ca67f0c85bc897e96b5f594c2e8b792c9ebd604b235bab579bc3c691119fbec105cd4649562d1e7d83be5b63a3401a1cad

data/assets/data/banner.html

@@ -259,8 +259,8 @@ exclude_from_search:                    true
                 		<img
                 			class="sticker-image"
                 			src="/assets/images/sticker/600x600/sticker-new-version.png"
-                			alt="Get new version 2023.0.13"
-                			title="Get new version 2023.0.13"
+                			alt="Get new version 2023.0.14"
+                			title="Get new version 2023.0.14"
                 			style="width: 140px; height: 120px;"
                 		>
                   </a>

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

@@ -35,9 +35,9 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.j1_config %}
-{% assign blocks            = site.data.blocks %}
-{% assign modules           = site.data.modules %}
+{% assign template_config      = site.data.j1_config %}
+{% assign blocks               = site.data.blocks %}
+{% assign modules              = site.data.modules %}
 
 {% comment %} Set config data (settings only)
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -95,10 +95,13 @@ var date                    = new Date();
 var timestamp_now           = date.toISOString();
 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 advertisingDefaults;
+var aadvertisingSettings;
+var advertisingOptions;
+var autoHideOnUnfilled;
+var addBorderOnUnfilled;
+var checkTrackingProtection;
+var showErrorPageOnBlocked;
 var adInitializerScriptText;
 var tracking_protection;
 var url;
@@ -128,6 +131,16 @@ var logText;
       // [INFO   ] [j1.adapter.advertising                  ] [ detected advertising provider (j1_config): {{advertising_provider}}} ]
       // [INFO   ] [j1.adapter.advertising                  ] [ start processing load region head, layout: {{page.layout}} ]
 
+      // Load  module DEFAULTS|CONFIG
+      advertisingDefaults     = $.extend({},   {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      aadvertisingSettings    = $.extend({},   {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      advertisingOptions      = $.extend(true, {}, advertisingDefaults, aadvertisingSettings);
+
+      autoHideOnUnfilled      = analyticsOptions.google.autoHideOnUnfilled;
+      addBorderOnUnfilled     = analyticsOptions.google.addBorderOnUnfilled;
+      checkTrackingProtection = analyticsOptions.google.checkTrackingProtection;
+      showErrorPageOnBlocked  = analyticsOptions.google.showErrorPageOnBlocked;
+
       // -----------------------------------------------------------------------
       // Default module settings
       // -----------------------------------------------------------------------
@@ -159,7 +172,7 @@ var logText;
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-          providerID          = '{{advertising_options.google.publisherID}}';
+          providerID          = advertisingOptions.publisherID;
           advertisingProvider = 'Google Adsense';
           validProviderID = (providerID.includes('your')) ? false : true;
           if (!validProviderID) {

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

@@ -60,6 +60,9 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+{% comment %} analytics_options:  {{ analytics_options | debug }} {% endcomment %}
+
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/analytics.js
@@ -91,15 +94,18 @@ var url               = new liteURL(window.location.href);
 var hostname          = url.hostname;
 var environment       = '{{environment}}';
 var gaScript          = document.createElement('script');
-var providerID        = '{{analytics_options.google.trackingID}}';
-var skipAllHosts      = '{{analytics_options.google.skipAllHosts}}';
-var validProviderID   = (providerID.includes('your')) ? false : true;
-var optInOut          = {{analytics_options.google.optInOut}};
-var anonymizeIP       = {{analytics_options.google.anonymizeIP}};
 var cookie_names      = j1.getCookieNames();
 var date              = new Date();
 var timestamp_now     = date.toISOString();
 var skipHost          = false;
+var analyticsDefaults;
+var analyticsSettings;
+var analyticsOptions;
+var providerID;
+var skipAllHosts;
+var optInOut;
+var anonymizeIP;
+var validProviderID;
 var skipHosts;
 var gaCookies;
 var user_consent;
@@ -120,12 +126,22 @@ var logText;
     init: function (options) {
 
     {% if analytics %}
+
+      // Load  module DEFAULTS|CONFIG
+      analyticsDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      analyticsSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      analyticsOptions  = $.extend(true, {}, analyticsDefaults, analyticsSettings);
+
       // [INFO   ] [j1.adapter.analytics                    ] [ detected analytics provider (j1_config): {{analytics_provider}}} ]
       // [INFO   ] [j1.adapter.analytics                    ] [ start processing load region head, layout: {{page.layout}} ]
-
       {% case analytics_provider %}
       {% when "google" %}
       // [INFO   ] [j1.adapter.analytics                    ] [ place provider: Google Adsense ]
+      providerID        = analyticsOptions.google.trackingID;
+      skipAllHosts      = analyticsOptions.google.skipAllHosts;
+      optInOut          = analyticsOptions.google.optInOut;
+      anonymizeIP       = analyticsOptions.google.anonymizeIP;
+      validProviderID   = (providerID.includes('your')) ? false : true;
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -162,7 +178,7 @@ var logText;
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-          gaExists  = document.getElementById('google-tag-manager');
+          gaExists  = document.getElementById('google-tag-manager') === null ? false : true;
           skipHosts = skipAllHosts.replace(/,/g, ' ');
           skipHost = skipHosts.includes(hostname);
 
@@ -183,7 +199,7 @@ var logText;
           }
 
           user_consent  = j1.readCookie(cookie_names.user_consent);
-          if (user_consent.analysis) {
+          if (user_consent.analysis && !skipHost ) {
             if (validProviderID) {
               logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
               logger.info('\n' + 'enable Google Analytics on ID: ' + providerID);

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

@@ -63,6 +63,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/carousel.js
@@ -88,11 +89,13 @@ regenerate:                             true
 'use strict';
 j1.adapter.carousel = (function (j1, window) {
   var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var dragging      = false;
+  var carouselDefaults;
+  var carouselSettings;
+  var carouselOptions;
   var _this;
   var logger;
   var logText;
-  var dragging      = false;
 
   // ---------------------------------------------------------------------------
   // Helper functions
@@ -122,20 +125,14 @@ j1.adapter.carousel = (function (j1, window) {
       _this   = j1.adapter.carousel;
       logger  = log4javascript.getLogger('j1.adapter.carousel');
 
+      // Load  module DEFAULTS|CONFIG
+      carouselDefaults = $.extend({},   {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      carouselSettings = $.extend({},   {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      carouselOptions  = $.extend(true, {}, carouselDefaults, carouselSettings);
+
       var dependencies_met_page_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
 
-          {% comment %} Load module config from yml data
-          -------------------------------------------------------------------------- {% endcomment %}
-          // Load  module DEFAULTS|CONFIG
-          /* eslint-disable */
-          moduleOptions = $.extend({}, {{carousel_options | replace: '=>', ':' | replace: 'nil', '""'}});
-          /* eslint-enable */
-
-          if (typeof settings !== 'undefined') {
-            moduleOptions = $.extend({}, moduleOptions, settings);
-          }
-
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');

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

@@ -69,7 +69,9 @@ j1.adapter.clipboard = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var clipboardDefaults;
+  var clipboardSettings;
+  var clipboardOptions;
   var logger;
   var logText;
   var _this;
@@ -104,6 +106,11 @@ j1.adapter.clipboard = (function (j1, window) {
       language  = '{{site.language}}';
       logger    = log4javascript.getLogger('j1.adapter.clipboard');
 
+      // Load  module DEFAULTS|CONFIG
+      clipboardDefaults = $.extend({},   {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      clipboardSettings = $.extend({},   {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      clipboardOptions  = $.extend(true, {}, clipboardDefaults, clipboardSettings);
+
       // initialize state flag
       _this.state = 'started';
       logText = '\n' + 'initialization: started';