j1-template 2022.4.6 → 2022.4.9

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

@@ -186,18 +186,23 @@ var j1 = (function (options) {
   var user_session_detected;
   var cookie_written;
 
+  // defaults for the template
+  var template_version;
+  var template_previous_version;
+  var template_version_changed;
+
   // defaults for themes
   var themeName;
   var themeCss;
-  var cssExtension              = (environment === 'production')
-                                  ? '.min.css'
-                                  : '.css'
+  var cssExtension                = (environment === 'production')
+                                    ? '.min.css'
+                                    : '.css'
 
   // defaults for 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}}';
-  var message_catalog_data_path = '{{template_config.message_catalog_data_path}}';
+  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}}';
+  var message_catalog_data_path   = '{{template_config.message_catalog_data_path}}';
 
   // Logger resources
   var logger;
@@ -211,6 +216,7 @@ var j1 = (function (options) {
     'user_consent':   '{{template_config.cookies.user_consent}}',
     'user_translate': '{{template_config.cookies.user_translate}}'
   };
+  var user_consent = {};
   var user_session = {
     'mode':                 'web',
     'writer':               'j1.adapter',
@@ -228,8 +234,14 @@ var j1 = (function (options) {
     'previous_page':        'na',
     'last_pager':           '/pages/public/blog/navigator/'
   };
-  var user_state = {
+  var user_state   = {
     'writer':               'j1.adapter',
+    'template_version':     '{{template_version}}',
+//
+//  for testing only
+//  'template_version':     'undefined',
+//  'template_version':     '2022.4.4',
+//
     'theme_name':           'UnoLight',
     'theme_css':            '',
     'theme_author':         'J1 Team',
@@ -240,7 +252,6 @@ var j1 = (function (options) {
     'translate_locale':     navigator.language || navigator.userLanguage,
     'last_session_ts':      ''
   };
-  var user_consent = {};
 
   // ---------------------------------------------------------------------------
   // helper functions
@@ -258,25 +269,9 @@ var j1 = (function (options) {
     return context[func].apply(context, args);
   }
 
-  function stringToBoolean(string) {
-    switch(string.toLowerCase().trim()) {
-      case "true":
-      case "yes":
-      case "1":
-        return true;
-      case "false":
-      case "no":
-      case "0":
-      case null:
-        return false;
-      default:
-        return Boolean(string);
-    }
-  }
-
   function isOdd(num) {
     var test = (num % 2).toString();
-    return stringToBoolean(test);
+    return j1.stringToBoolean(test);
   }
 
   // ---------------------------------------------------------------------------
@@ -302,7 +297,7 @@ var j1 = (function (options) {
 
       // settings for dynamic pages
       scrollDynamicPagesTopOnChange = frontmatterOptions.scrollDynamicPagesTopOnChange ? frontmatterOptions.scrollDynamicPagesTopOnChange : '{{template_config.scrollDynamicPagesTopOnChange}}';
-      scrollDynamicPagesTopOnChange = stringToBoolean(scrollDynamicPagesTopOnChange);
+      scrollDynamicPagesTopOnChange = j1.stringToBoolean(scrollDynamicPagesTopOnChange);
 
       // -----------------------------------------------------------------------
       // Global variable settings
@@ -319,6 +314,9 @@ var j1 = (function (options) {
       var gaCookies         = j1.findCookie('_ga');
       var themerOptions     = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
+      // current template version
+      template_version  = j1.getTemplateVersion();
+
       // -----------------------------------------------------------------------
       // status settings
       // save status into the adapter object for (later) global access
@@ -361,6 +359,26 @@ var j1 = (function (options) {
                             expires:  365
                           });
 
+      if (typeof user_state.template_version == 'undefined') {
+        // add for compatibility reasons
+        template_version_changed = true;
+        user_state.template_version = template_version;
+        logger.warn('\n' + 'template_version not found, set value to: ' +  template_version);
+        cookie_written = j1.writeCookie({
+          name:     cookie_names.user_state,
+          data:     user_state,
+          secure:   secure,
+          expires:  365
+        });
+      } else if (user_state.template_version != template_version) {
+        // update for changed template version
+        template_previous_version = user_state.template_version;
+        template_version_changed = true;
+        user_state.template_version = template_version;
+      } else {
+        template_version_changed = false;
+      }
+
       if (!user_consent.analysis || !user_consent.personalization)  {
         if (expireCookiesOnRequiredOnly) {
           // expire permanent cookies to session
@@ -1027,6 +1045,7 @@ var j1 = (function (options) {
               // redirect to error page: blocked content
               window.location.href = '/446.html';
             } else {
+
               logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
             }
           }
@@ -1125,6 +1144,29 @@ var j1 = (function (options) {
           // update sidebar for changed theme data
           logger.info('\n' + 'update sidebar');
           user_state        = j1.readCookie(cookie_names.user_state);
+
+          if (template_version_changed) {
+            if (typeof template_previous_version == 'undefined') template_previous_version = 'na';
+            logger.warn('\n' + 'template version detected as changed');
+            logger.warn('\n' + 'template version previous|current: ' +  template_previous_version + '|' + template_version);
+            // Update the user_state cookie
+            // TODO:  replace theme_version by template_version as they
+            //        are alwas the same
+            //        disable: user_state.theme_version = template_version;
+            //
+            user_state.template_version = template_version;
+            cookie_written = j1.writeCookie({
+            	name:     cookie_names.user_state,
+            	data:     user_state,
+            	secure:   secure,
+            	expires:  365
+            });
+            logger.warn('\n' + 'template version updated to: ' +  template_version);
+          } else {
+            logger.info('\n' + 'template version detected: ' +  user_state.template_version);
+          }
+
+          // set current user data
           current_user_data = j1.mergeData(user_session, user_state);
           j1.core.navigator.updateSidebar(current_user_data);
 
@@ -1875,7 +1917,7 @@ var j1 = (function (options) {
               $('#macro-theme-version').each(function() {
                 var $this = $(this);
                 var $html = $this.html();
-                $this.html($html.replace('??theme-version', user_data.theme_version));
+                $this.html($html.replace('??theme-version', user_data.template_version));
               });
 
             });
@@ -2297,6 +2339,28 @@ var j1 = (function (options) {
       }, 25);
     },
 
+    // -------------------------------------------------------------------------
+    // stringToBoolean()
+    // convert a string to boolean
+    // -------------------------------------------------------------------------
+    stringToBoolean: function (string) {
+
+      switch(string.toLowerCase().trim()) {
+        case "true":
+        case "yes":
+        case "1":
+          return true;
+        case "false":
+        case "no":
+        case "0":
+        case null:
+          return false;
+        default:
+          return Boolean(string);
+      }
+
+    }, // END stringToBoolean
+
     // -------------------------------------------------------------------------
     // registerEvents()
     //

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

@@ -131,7 +131,7 @@ j1.adapter.justifiedGallery = (function (j1, window) {
           /* eslint-enable */
 
           if (typeof settings !== 'undefined') {
-            moduleOptions = j1.mergeData(moduleOptions, settings);
+            moduleOptions = $.extend({}, moduleOptions, settings);
           }
 
           _this.initialize(moduleOptions);

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture cache %}