j1-template 2024.2.0 → 2024.2.1

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

@@ -1,241 +1,242 @@
----
-regenerate:                             true
----
-
-{% capture cache %}
-
-{% comment %}
- # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lightbox.js
- # Liquid template to adapt Lightbox Core functions
- #
- # Product/Info:
- # https://jekyll.one
- #
- # Copyright (C) 2023, 2024 Juergen Adams
- #
- # J1 Template is licensed under the MIT License.
- # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
- # -----------------------------------------------------------------------------
- # Test data:
- #  {{ liquid_var | debug }}
- # -----------------------------------------------------------------------------
-{% endcomment %}
-
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Set global settings
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site.environment %}
-{% assign template_version  = site.version %}
-
-{% comment %} Process YML config data
-================================================================================ {% endcomment %}
-
-{% comment %} Set config files
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.j1_config %}
-{% assign modules           = site.data.modules %}
-
-{% comment %} Set config data
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign lightbox_defaults = modules.defaults.lightbox.defaults %}
-{% assign lightbox_settings = modules.lightbox.settings %}
-
-{% comment %} Set config options
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign lightbox_options  = lightbox_defaults | merge: lightbox_settings %}
-
-{% comment %} Detect prod mode
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign production = false %}
-{% if environment == 'prod' or environment == 'production' %}
-  {% assign production = true %}
-{% endif %}
-
-/*
- # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lightbox.js
- # JS Adapter for J1 Lightbox
- #
- # Product/Info:
- # https://jekyll.one
- # https://github.com/lokesh/lightbox2/
- #
- # Copyright (C) 2023, 2024 Juergen Adams
- # Copyright (C) 2007, 2018 Lokesh Dhakar
- #
- # J1 Template is licensed under the MIT License.
- # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
- # Lightbox V2 is licensed under the MIT License.
- # For details, see https://github.com/lokesh/lightbox2/
- #
- # -----------------------------------------------------------------------------
- # Adapter generated: {{site.time}}
- # -----------------------------------------------------------------------------
-*/
-
-// -----------------------------------------------------------------------------
-// ESLint shimming
-// -----------------------------------------------------------------------------
-/* eslint indent: "off"                                                       */
-// -----------------------------------------------------------------------------
-'use strict';
-j1.adapter.lightbox = ((j1, window) => {
-
-  {% comment %} Global variables
-  ------------------------------------------------------------------------------ {% endcomment %}
-  var environment  = '{{environment}}';
-  var state        = 'not_started';
-  var lightboxDefaults;
-  var lightboxSettings;
-  var lightboxOptions;
-  var frontmatterOptions;
-
-  var _this;
-  var logger;
-  var logText;
-
-  // date|time
-  var startTime;
-  var endTime;
-  var startTimeModule;
-  var endTimeModule;
-  var timeSeconds;
-
-  // ---------------------------------------------------------------------------
-  // helper functions
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // main
-  // ---------------------------------------------------------------------------
-  return {
-
-    // -------------------------------------------------------------------------
-    // adapter initializer
-    // -------------------------------------------------------------------------
-    init: (options) => {
-
-      // -----------------------------------------------------------------------
-      // default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.lightbox',
-        generated:   '{{site.time}}'
-      }, options);
-
-      // -----------------------------------------------------------------------
-      // global variable settings
-      // -----------------------------------------------------------------------
-      _this   = j1.adapter.lightbox;
-      logger  = log4javascript.getLogger('j1.adapter.lightbox');
-
-      // create settings object from frontmatter (page settings)
-      frontmatterOptions    = options !== null ? $.extend({}, options) : {};
-
-      // Load module DEFAULTS|CONFIG
-      lightboxDefaults      = $.extend({}, {{lightbox_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
-      lightboxSettings      = $.extend({}, {{lightbox_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
-      lightboxOptions       = $.extend(true, {}, lightboxDefaults, lightboxSettings, frontmatterOptions);
-
-      // -----------------------------------------------------------------------
-      // module initializer
-      // -----------------------------------------------------------------------
-      var dependencies_met_page_ready = setInterval (() => {
-        var pageState      = $('#content').css("display");
-        var pageVisible    = (pageState === 'block') ? true: false;
-        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
-        var lbV2Finished   = ($('#lightbox').length) ? true : false;
-
-         if (j1CoreFinished && pageVisible && lbV2Finished) {
-           startTimeModule = Date.now();
-
-          _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized');
-
-          lightbox.option({
-            alwaysShowNavOnTouchDevices:  lightboxOptions.alwaysShowNavOnTouchDevices,
-            albumLabel:                   lightboxOptions.albumLabel,
-            disableScrolling:             lightboxOptions.disableScrolling,
-            fadeDuration:                 lightboxOptions.fadeDuration,
-            fitImagesInViewport:          lightboxOptions.fitImagesInViewport,
-            imageFadeDuration:            lightboxOptions.imageFadeDuration,
-            maxWidth:                     lightboxOptions.maxWidth,
-            maxHeight:                    lightboxOptions.maxHeight,
-            positionFromTop:              lightboxOptions.positionFromTop,
-            resizeDuration:               lightboxOptions.resizeDuration,
-            showImageNumberLabel:         lightboxOptions.showImageNumberLabel,
-            wrapAround:                   lightboxOptions.wrapAround
-          });
-
-          _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'initializing module finished');
-
-          endTimeModule = Date.now();
-          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
-
-          clearInterval(dependencies_met_page_ready);
-        } // END if pageVisible
-      }, 10); // END dependencies_met_page_ready
-
-    }, // END init lightbox
-
-    // -------------------------------------------------------------------------
-    // messageHandler()
-    // manage messages send from other J1 modules
-    // -------------------------------------------------------------------------
-    messageHandler: (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: (stat) => {
-      _this.state = stat;
-    }, // END setState
-
-    // -------------------------------------------------------------------------
-    // getState()
-    // Returns the current (processing) state of the module
-    // -------------------------------------------------------------------------
-    getState: () => {
-      return _this.state;
-    } // END getState
-
-  }; // END main (return)
-})(j1, window);
-
-{% endcapture %}
-{% if production %}
-  {{ cache | minifyJS }}
-{% else %}
-  {{ cache | strip_empty_lines }}
-{% endif %}
-{% assign cache = nil %}
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/lightbox.js
+ # Liquid template to adapt Lightbox Core functions
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2023, 2024 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign lightbox_defaults = modules.defaults.lightbox.defaults %}
+{% assign lightbox_settings = modules.lightbox.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign lightbox_options  = lightbox_defaults | merge: lightbox_settings %}
+
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/lightbox.js
+ # JS Adapter for J1 Lightbox
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # https://github.com/lokesh/lightbox2/
+ #
+ # Copyright (C) 2023, 2024 Juergen Adams
+ # Copyright (C) 2007, 2018 Lokesh Dhakar
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # Lightbox V2 is licensed under the MIT License.
+ # For details, see https://github.com/lokesh/lightbox2/
+ #
+ # -----------------------------------------------------------------------------
+ # Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+j1.adapter.lightbox = ((j1, window) => {
+
+  {% comment %} Global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var environment       = '{{environment}}';
+  var state             = 'not_started';
+
+  var lightboxDefaults;
+  var lightboxSettings;
+  var lightboxOptions;
+  var frontmatterOptions;
+
+  var _this;
+  var logger;
+  var logText;
+
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
+
+  // ---------------------------------------------------------------------------
+  // helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // main
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // adapter initializer
+    // -------------------------------------------------------------------------
+    init: (options) => {
+
+      // -----------------------------------------------------------------------
+      // default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.lightbox',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // global variable settings
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.lightbox;
+      logger  = log4javascript.getLogger('j1.adapter.lightbox');
+
+      // create settings object from frontmatter (page settings)
+      frontmatterOptions    = options !== null ? $.extend({}, options) : {};
+
+      // Load module DEFAULTS|CONFIG
+      lightboxDefaults      = $.extend({}, {{lightbox_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      lightboxSettings      = $.extend({}, {{lightbox_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      lightboxOptions       = $.extend(true, {}, lightboxDefaults, lightboxSettings, frontmatterOptions);
+
+      // -----------------------------------------------------------------------
+      // module initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_page_ready = setInterval (() => {
+        var pageState      = $('#content').css("display");
+        var pageVisible    = (pageState === 'block') ? true: false;
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
+        var lbV2Finished   = ($('#lightbox').length) ? true : false;
+
+         if (j1CoreFinished && pageVisible && lbV2Finished) {
+           startTimeModule = Date.now();
+
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
+
+          lightbox.option({
+            alwaysShowNavOnTouchDevices:  lightboxOptions.alwaysShowNavOnTouchDevices,
+            albumLabel:                   lightboxOptions.albumLabel,
+            disableScrolling:             lightboxOptions.disableScrolling,
+            fadeDuration:                 lightboxOptions.fadeDuration,
+            fitImagesInViewport:          lightboxOptions.fitImagesInViewport,
+            imageFadeDuration:            lightboxOptions.imageFadeDuration,
+            maxWidth:                     lightboxOptions.maxWidth,
+            maxHeight:                    lightboxOptions.maxHeight,
+            positionFromTop:              lightboxOptions.positionFromTop,
+            resizeDuration:               lightboxOptions.resizeDuration,
+            showImageNumberLabel:         lightboxOptions.showImageNumberLabel,
+            wrapAround:                   lightboxOptions.wrapAround
+          });
+
+          _this.setState('finished');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'initializing module finished');
+
+          endTimeModule = Date.now();
+          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
+          clearInterval(dependencies_met_page_ready);
+        } // END if pageVisible
+      }, 10); // END dependencies_met_page_ready
+
+    }, // END init lightbox
+
+    // -------------------------------------------------------------------------
+    // messageHandler()
+    // manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: (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: (stat) => {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: () => {
+      return _this.state;
+    } // END getState
+
+  }; // END main (return)
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -93,6 +93,7 @@ j1.adapter.logger = ((j1, window) => {
   var state                 = 'not_started';
   var utilServerOptions     = {};
   var ajaxAppenderOptions   = {};
+
   var loggerDefaults;
   var loggerSettings;
   var loggerOptions;

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

@@ -211,11 +211,9 @@ j1.adapter.lunr = ((j1, window) => {
       // update searchHistory
       if (searchHistoryFromCookie) {
         logger.debug('\n' + 'save search history to cookie');
-        j1.removeCookie({
-          name:   cookie_names.search_prompt,
-          domain: auto_domain,
-          secure: secure
-        });
+
+        // remove BEFORE write
+        j1.removeCookie({ name: cookie_names.search_prompt });
 
         if (newHistory.length > 0) {
           cookie_written = j1.writeCookie({
@@ -652,11 +650,9 @@ j1.adapter.lunr = ((j1, window) => {
         // write current history to cookie
         if (searchHistoryFromCookie) {
           logger.debug('\n' + 'sendButton, save prompt history to cookie');
-          j1.removeCookie({
-            name:   cookie_names.search_prompt,
-            domain: auto_domain,
-            secure: secure
-          });
+
+          // remove BEFORE write
+          j1.removeCookie({ name: cookie_names.search_prompt });
           cookie_written = j1.writeCookie({
             name:   cookie_names.search_prompt,
             data:   textHistory,