j1-template 2024.1.5 → 2024.2.0

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

@@ -27,8 +27,8 @@ regenerate:                             true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site.environment %}
-{% assign asset_path        = '/assets/themes/j1' %}
+{% assign environment        = site.environment %}
+{% assign asset_path         = '/assets/themes/j1' %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
@@ -50,7 +50,7 @@ regenerate:                             true
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign comments          = particles_options.enabled %}
+{% assign comments           = particles_options.enabled %}
 
 {% comment %} Detect prod mode
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -82,34 +82,41 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.particles = (function (j1, window) {
-
-{% comment %} Set global variables
--------------------------------------------------------------------------------- {% endcomment %}
-var environment     = '{{environment}}';
-var cookie_names    = j1.getCookieNames();
-var state           = 'not_started';
-var particleDefaults;
-var particleSettings;
-var particleOptions;
-var frontmatterOptions;
-var _this;
-var logger;
-var logText;
+j1.adapter.particles = ((j1, window) => {
+
+  {% comment %} Set global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var environment         = '{{environment}}';
+  var cookie_names        = j1.getCookieNames();
+  var state               = 'not_started';
+  var particleDefaults;
+  var particleSettings;
+  var particleOptions;
+  var frontmatterOptions;
+
+  var _this;
+  var logger;
+  var logText;
+
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
 
   // ---------------------------------------------------------------------------
-  // Main object
+  // main
   // ---------------------------------------------------------------------------
   return {
 
     // -------------------------------------------------------------------------
-    // init()
     // adapter initializer
     // -------------------------------------------------------------------------
-    init: function (options) {
+    init: (options) => {
 
       // -----------------------------------------------------------------------
-      // Default module settings
+      // default module settings
       // -----------------------------------------------------------------------
       var settings = $.extend({
         module_name: 'j1.adapter.particles',
@@ -117,7 +124,7 @@ var logText;
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
 
       // create settings object from frontmatter
@@ -132,11 +139,16 @@ var logText;
       logger = log4javascript.getLogger('j1.adapter.particles');
 
       // -----------------------------------------------------------------------
-      // initializer
+      // module initializer
       // -----------------------------------------------------------------------
-      var dependencies_met_page_ready = setInterval (function (options) {
+      var dependencies_met_page_ready = setInterval ((options) => {
+        var pageState      = $('#content').css("display");
+        var pageVisible    = (pageState === 'block') ? true : false;
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
+
+        if (j1CoreFinished) {
+          startTimeModule = Date.now();
 
-        if ( j1.getState() === 'finished' ) {
           var obj;
           var data;
           var allConfigs;
@@ -148,7 +160,7 @@ var logText;
 
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized')
+          logger.info('\n' + 'module is being initialized');
 
           {% for item in particles_settings.particles %}
             {% if item.particle.enabled %}
@@ -160,13 +172,13 @@ var logText;
               particleContainer   = '{{ item.particle.canvas_selector }}';
               $(particleContainer).attr('id', particleID);
 
-              var dependencies_met_attic_ready = setInterval (function (options) {
+              var dependencies_met_attic_ready = setInterval((options) => {
                 if ($('#' + particleID).length != 0) {
                   logger.info('\n' + 'container found: ' + '#' + particleID);
 
                   // load particles config from yaml data file (dataUrl)
                   $.get(dataUrl)
-                  .done(function (data) {
+                  .done((data) => {
                     allConfigs = yaml.loadAll(data, 'utf8');
 
                     {% for item in particles_settings.particles %}
@@ -184,46 +196,55 @@ var logText;
                     {% endif %}
                   {% endfor %}
                   })
-                  .fail(function () {
+                  .fail(() => {
                     logger.error('\n' + 'loading data: failed');
                   });
 
                 } else {
                   logger.warn('\n' + 'container id not found: ' + '#' + particleID);
                 }
+
                 clearInterval(dependencies_met_attic_ready);
               }, 10);
             {% endif %}
           {% endfor %}
 
-          clearInterval(dependencies_met_page_ready);
-        }
-      }, 10);
+          _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 j1CoreFinished
+      }, 10); // END dependencies_met_page_ready
     }, // END init
 
     // -------------------------------------------------------------------------
     // messageHandler()
     // manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function (sender, message) {
+    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
+      //  process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
+
         //
-        // Place handling of command|action here
+        // place handling of command|action here
         //
+
         logger.info('\n' + message.text);
       }
 
       //
-      // Place handling of other command|action here
+      // place handling of other command|action here
       //
 
       return true;
@@ -231,9 +252,9 @@ var logText;
 
     // -------------------------------------------------------------------------
     // setState()
-    // Sets the current (processing) state of the module
+    // sets the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function (stat) {
+    setState: (stat) => {
       _this.state = stat;
     }, // END setState
 
@@ -241,11 +262,11 @@ var logText;
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
-    getState: function () {
+    getState: () => {
       return _this.state;
     } // END getState
 
-  }; // END return
+  }; // END main (return)
 })(j1, window);
 
 {% endcapture -%}

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

@@ -27,17 +27,17 @@ regenerate:                             true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site.environment %}
-{% assign asset_path        = "/assets/themes/j1" %}
+{% 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 %}
+{% assign template_config       = site.data.j1_config %}
+{% assign blocks                = site.data.blocks %}
+{% assign modules               = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -78,7 +78,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.rangeSlider = (function (j1, window) {
+j1.adapter.rangeSlider = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -89,14 +89,21 @@ j1.adapter.rangeSlider = (function (j1, window) {
   var rangeSliderSettings;
   var rangeSliderOptions;
   var elms;
+
   var _this;
   var logger;
   var logText;
 
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
+
   // ---------------------------------------------------------------------------
-  // Helper functions
+  // helper functions
   // ---------------------------------------------------------------------------
-
   function prepend(newNode, referenceNode) {
     referenceNode.parentNode.insertBefore(newNode, referenceNode);
   }
@@ -110,17 +117,17 @@ j1.adapter.rangeSlider = (function (j1, window) {
   }
 
   // ---------------------------------------------------------------------------
-  // Main object
+  // main
   // ---------------------------------------------------------------------------
   return {
 
     // -------------------------------------------------------------------------
-    // Initializer
+    // adapter initializer
     // -------------------------------------------------------------------------
-    init: function (options) {
+    init: (options) => {
 
       // -----------------------------------------------------------------------
-      // Default module settings
+      // default module settings
       // -----------------------------------------------------------------------
       var settings = $.extend({
         module_name: 'j1.adapter.rangeSlider',
@@ -128,7 +135,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.rangeSlider;
       logger  = log4javascript.getLogger('j1.adapter.rangeSlider');
@@ -138,23 +145,26 @@ j1.adapter.rangeSlider = (function (j1, window) {
       rangeSliderSettings = $.extend({}, {{range_slider_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
       rangeSliderOptions  = $.extend(true, {}, rangeSliderDefaults, rangeSliderSettings);
 
-      var dependencies_met_j1_finished = setInterval(function() {
-        if (j1.getState() == 'finished') {
+      // -----------------------------------------------------------------------
+      // module initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_j1_finished = setInterval(() => {
+        var pageState      = $('#content').css("display");
+        var pageVisible    = (pageState === 'block') ? true : false;
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
 
-          logger.info('\n' + 'module is being initialized');
+        if (j1CoreFinished) {
+          startTimeModule = Date.now();
 
-          // initialize state flag
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
 
-          var dependencies_met_elms_loaded = setInterval(function() {
+          var dependencies_met_elms_loaded = setInterval(() => {
             elms = document.querySelectorAll('.range-slider');
             if (elms.length) {
               logger.info('\n' + 'number of rangeSlider elements found: ' + elms.length);
 
-              // ---------------------------------------------------------------
-              // slider initializer
-              // ---------------------------------------------------------------
               var log_text = '\n' + 'rangeSlider elements are being initialized';
               logger.info(log_text);
 
@@ -186,7 +196,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
                 {% if item.slider.options.cbOnUpdate %}       {% assign cbOnUpdate      = item.slider.options.cbOnUpdate %}       {% endif %}
 
 
-                elms.forEach(function (elm) {
+                elms.forEach((elm) => {
                   var id      = elm.id;
                   var parent  = document.getElementById(id);
 
@@ -222,7 +232,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
                     label.innerHTML = '{{label}}';
                     insert(label, parent);
 
-                    slider_{{slider_id}}.noUiSlider.on('update', function (values, handle) {
+                    slider_{{slider_id}}.noUiSlider.on('update', (values, handle) => {
                       var logger = log4javascript.getLogger('j1.adapter.rangeSlider.cbOnUpdate');
                       logger.debug('\n' + 'current value: ' + values[handle]);
                     });
@@ -235,28 +245,33 @@ j1.adapter.rangeSlider = (function (j1, window) {
 
               if (instances.length) {
                 logger.info('\n' + 'number of rangeSlider instances configured: ' + instances.length);
-                _this.setState('finished');
-                logger.debug('\n' + 'state: ' + _this.getState());
-                logger.info('\n' + 'initializing module finished');
               } else {
                 logger.error('\n' + 'no configured rangeSlider instances found');
                 logger.warning('\n' + 'initializing module failed');
-              }
-            } // ENF if elms
+              } // END if instances
+            } // END if elms
+
             clearInterval(dependencies_met_elms_loaded);
-          }, 10);
-          clearInterval(dependencies_met_j1_finished);
-        } // END dependencies_met_j1_finished
-      }, 10);
+          }, 10); // END dependencies_met_elms_loaded
+
+          _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_j1_finished);
+        } // END if j1CoreFinished
+      }, 10); // END dependencies_met_j1_finished
     }, // END init
 
     // -------------------------------------------------------------------------
     // cbOnClick)
-    // Called by the rangeSlider CORE module when and dropdown element
+    // called by the rangeSlider CORE module when and dropdown element
     // is clicked
     // -------------------------------------------------------------------------
-    cbOnclick: function (event) {
+    cbOnclick: (event) => {
       var logger  = log4javascript.getLogger('j1.adapter.rangeSlider.cbOnClick');
       var itemEl = $(event.target).closest('li')[0];
 
@@ -268,9 +283,9 @@ j1.adapter.rangeSlider = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // cbOnOpen()
-    // Called by the rangeSlider CORE module when dropdown get opened
+    // called by the rangeSlider CORE module when dropdown get opened
     // -------------------------------------------------------------------------
-    cbOnOpen: function (elm) {
+    cbOnOpen: (elm) => {
       var logger  = log4javascript.getLogger('j1.adapter.rangeSlider.cbOnOpen');
       var id      = elm.id;
 
@@ -281,9 +296,9 @@ j1.adapter.rangeSlider = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // cbOnClose()
-    // Called by the rangeSlider CORE module when dropdown get closed
+    // called by the rangeSlider CORE module when dropdown get closed
     // -------------------------------------------------------------------------
-    cbOnClose: function (elm) {
+    cbOnClose: (elm) => {
       var logger    = log4javascript.getLogger('j1.adapter.rangeSlider.cbOnClose');
       var id        = elm.id;
       var listItems = '#' + elm.id + " li";
@@ -309,27 +324,29 @@ j1.adapter.rangeSlider = (function (j1, window) {
     },
 
     // -------------------------------------------------------------------------
-    // messageHandler
-    // Manage messages send from other J1 modules
+    // messageHandler()
+    // manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function (sender, message) {
+    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
+      //  process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
+
         //
-        // Place handling of command|action here
+        // place handling of command|action here
         //
+
         logger.info('\n' + message.text);
       }
 
       //
-      // Place handling of other command|action here
+      // place handling of other command|action here
       //
 
       return true;
@@ -337,9 +354,9 @@ j1.adapter.rangeSlider = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // setState()
-    // Sets the current (processing) state of the module
+    // sets the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function (stat) {
+    setState: (stat) => {
       _this.state = stat;
     }, // END setState
 
@@ -347,11 +364,11 @@ j1.adapter.rangeSlider = (function (j1, window) {
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
-    getState: function () {
+    getState: () => {
       return _this.state;
     } // END getState
 
-  }; // END return
+  }; // END main (return)
 })(j1, window);
 
 {% endcapture %}