j1-template 2024.1.5 → 2024.2.0

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

@@ -41,8 +41,8 @@ regenerate:                             true
 
 {% comment %} Set config data (unused)
 --------------------------------------------------------------------------------
-{% assign custom_defaults = modules.defaults.custom.defaults %}
-{% assign custom_settings = modules.custom.settings %}
+{% assign custom_defaults   = modules.defaults.custom.defaults %}
+{% assign custom_settings   = modules.custom.settings %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Set config options (unused)
@@ -80,7 +80,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.customFunctions = (function (j1, window) {
+j1.adapter.customFunctions = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -89,26 +89,34 @@ j1.adapter.customFunctions = (function (j1, window) {
   var instances     = [];
   var state         = 'not_started';
   var frontmatterOptions;
+
   var _this;
   var logger;
   var logText;
 
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
+
   // ---------------------------------------------------------------------------
-  // Helper functions
+  // helper functions
   // ---------------------------------------------------------------------------
 
   // ---------------------------------------------------------------------------
-  // 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.custom_functions',
@@ -116,10 +124,10 @@ j1.adapter.customFunctions = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
-      _this   = j1.adapter.dropdowns;
-      logger  = log4javascript.getLogger('j1.adapter.custom_functions');
+      _this  = j1.adapter.custom_functions;
+      logger = log4javascript.getLogger('j1.adapter.custom_functions');
 
       // initialize state flag
       _this.setState('started');
@@ -128,39 +136,46 @@ j1.adapter.customFunctions = (function (j1, window) {
 
       // create settings object from frontmatterOptions
       frontmatterOptions = options != null ? $.extend({}, options) : {};
-      moduleOptions = $.extend({}, {{dropdowns_options | replace: 'nil', 'null' | replace: '=>', ':' }});
+      moduleOptions      = $.extend({}, {{dropdowns_options | replace: 'nil', 'null' | replace: '=>', ':' }});
 
       if (typeof frontmatterOptions !== 'undefined') {
         moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);
       }
 
-      var dependencies_met_j1_finished = setInterval(function() {
-        if (j1.getState() == 'finished') {
-          var elms = document.querySelectorAll('.dropdowns');
+      // -----------------------------------------------------------------------
+      // module initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_j1_finished = setInterval(() => {
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
+
+        if (j1CoreFinished) {
+          startTimeModule = Date.now();
 
-          // -------------------------------------------------------------------
-          // Initializer
-          // -------------------------------------------------------------------
-          var log_text = '\n' + 'custom functions are being initialized';
-          logger.info(log_text);
+          _this.setState('started');
+          logger.debug('\n' + 'set module state to: ' + _this.getState());
+          logger.info('\n' + 'custom functions are being initialized');
 
           //
-          // place init code here if required
+          // place init code here
           //
+
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'initializing custom functions: finished');
 
-          clearInterval(dependencies_met_j1_finished);
-        } // END dependencies_met_j1_finished
-      }, 10);
+          endTimeModule = Date.now();
+          logger.info('\n' + 'initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
 
+          clearInterval(dependencies_met_j1_finished);
+        } // END j1CoreFinished
+      }, 10); // END dependencies_met_j1_finished
     }, // END init
 
     // -------------------------------------------------------------------------
     // custom_1
     // Called by ???
     // -------------------------------------------------------------------------
-    custom_1: function (options) {
+    custom_1: (options) => {
       var logger  = log4javascript.getLogger('j1.adapter.custom_functions.custom_1');
 
       logText = '\n' + 'entered custom function: custom_1';
@@ -170,27 +185,29 @@ j1.adapter.customFunctions = (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;
@@ -198,9 +215,9 @@ j1.adapter.customFunctions = (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
 
@@ -208,11 +225,11 @@ j1.adapter.customFunctions = (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 %}

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

@@ -27,27 +27,27 @@ 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 (unused)
 --------------------------------------------------------------------------------
-{% assign custom_module_defaults = modules.defaults.custom_module.defaults %}
-{% assign custom_module_settings = modules.custom_module.settings %}
+{% assign custom_module_defaults  = modules.defaults.custom_module.defaults %}
+{% assign custom_module_settings  = modules.custom_module.settings %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Set config options (unused)
 --------------------------------------------------------------------------------
-{% assign custom_module_options  = custom_module_defaults | merge: custom_module_settings %}
+{% assign custom_module_options   = custom_module_defaults | merge: custom_module_settings %}
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Detect prod mode
@@ -80,7 +80,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.customModule = (function (j1, window) {
+j1.adapter.customModule = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -89,26 +89,34 @@ j1.adapter.customModule = (function (j1, window) {
   var instances     = [];
   var state         = 'not_started';
   var frontmatterOptions;
+
   var _this;
   var logger;
   var logText;
 
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
+
   // ---------------------------------------------------------------------------
-  // Helper functions
+  // helper functions
   // ---------------------------------------------------------------------------
 
   // ---------------------------------------------------------------------------
-  // 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.customModule',
@@ -116,16 +124,11 @@ j1.adapter.customModule = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.dropdowns;
       logger  = log4javascript.getLogger('j1.adapter.customModule');
 
-      // initialize state flag
-      _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
       // create settings object from frontmatterOptions
       frontmatterOptions  = options != null ? $.extend({}, options) : {};
       moduleOptions       = $.extend({}, {{dropdowns_options | replace: 'nil', 'null' | replace: '=>', ':' }});
@@ -134,34 +137,39 @@ j1.adapter.customModule = (function (j1, window) {
         moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
       }
 
-      var dependencies_met_j1_finished = setInterval(function() {
-        if (j1.getState() == 'finished') {
-          var elms = document.querySelectorAll('.dropdowns');
+      // -----------------------------------------------------------------------
+      // module initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_j1_finished = setInterval(() => {
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
+
+        if (j1CoreFinished) {
+          startTimeModule = Date.now();
 
-          // -------------------------------------------------------------------
-          // Initializer
-          // -------------------------------------------------------------------
-          var log_text = '\n' + 'custom functions are being initialized';
-          logger.info(log_text);
+          _this.setState('started');
+          logger.debug('\n' + 'set module state to: ' + _this.getState());
+          logger.info('\n' + 'custom functions are being initialized');
 
           //
-          // place init code here if required
+          // place init code here
           //
+
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'initializing custom functions: finished');
 
-          clearInterval(dependencies_met_j1_finished);
-        } // END dependencies_met_j1_finished
-      }, 10);
-
+          endTimeModule = Date.now();
+          logger.info('\n' + 'initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+        } // END j1CoreFinished
+      }, 10); // END dependencies_met_j1_finished
     }, // END init
 
     // -------------------------------------------------------------------------
     // custom_module_1
-    // Called by ???
+    // called by ???
     // -------------------------------------------------------------------------
-    custom_module_1: function (options) {
-      var logger  = log4javascript.getLogger('j1.adapter.customModule.custom_module_1');
+    custom_module_1: (options) => {
+      var logger = log4javascript.getLogger('j1.adapter.customModule.custom_module_1');
 
       logText = '\n' + 'entered custom function: custom_module_1';
       logger.info(logText);
@@ -170,27 +178,29 @@ j1.adapter.customModule = (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;
@@ -198,9 +208,9 @@ j1.adapter.customModule = (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
 
@@ -208,11 +218,11 @@ j1.adapter.customModule = (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 %}

data/assets/themes/j1/adapter/js/docsearch.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          = docsearch_options.enabled %}
+{% assign comments           = docsearch_options.enabled %}
 
 {% comment %} Detect prod mode
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -82,36 +82,43 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.docsearch = (function (j1, window) {
+j1.adapter.docsearch = ((j1, window) => {
 
 {% comment %} Set global variables
 -------------------------------------------------------------------------------- {% endcomment %}
-var environment   = '{{environment}}';
-var state         = 'not_started';
-var cookie_names  = j1.getCookieNames();
+var environment           = '{{environment}}';
+var state                 = 'not_started';
+var cookie_names          = j1.getCookieNames();
 var docsearchDefaults;
 var docsearchSettings;
 var docsearchOptions;
 var docsearchModal;
 var modal_container;
 var user_consent;
+
 var _this;
 var logger;
 var logText;
 
+// date|time
+var startTime;
+var endTime;
+var startTimeModule;
+var endTimeModule;
+var timeSeconds;
+
   // ---------------------------------------------------------------------------
-  // Main object
+  // main
   // ---------------------------------------------------------------------------
   return {
 
     // -------------------------------------------------------------------------
-    // init()
-    // initializer
+    // adapter initializer
     // -------------------------------------------------------------------------
-    init: function () {
+    init: () => {
 
       // -----------------------------------------------------------------------
-      // Default module settings
+      // default module settings
       // -----------------------------------------------------------------------
       docsearchDefaults = $.extend({}, {{docsearch_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
       docsearchSettings = $.extend({}, {{docsearch_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
@@ -120,10 +127,6 @@ var logText;
       _this  = j1.adapter.docsearch;
       logger = log4javascript.getLogger('j1.adapter.docsearch');
 
-      _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
       modal_container               = document.createElement('div');
       modal_container.id            = 'docsearch_container';
       modal_container.style.display = 'none';
@@ -136,14 +139,20 @@ var logText;
       document.body.append(modal_container);
 
       // -----------------------------------------------------------------------
-      // initializer
+      // module initializer
       // -----------------------------------------------------------------------
-      var dependencies_met_page_ready = setInterval (function (options) {
-        var pageState     = $('#no_flicker').css("display");
-        var pageVisible   = (pageState == 'block') ? true : false;
-        var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
+      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 atticFinished  = (j1.adapter.attic.getState() === 'finished') ? true: false;
 
-        if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+        if (j1CoreFinished && pageVisible && atticFinished) {
+          startTimeModule = Date.now();
+
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
 
           user_consent = j1.readCookie(cookie_names.user_consent);
           if (!user_consent.personalization) {
@@ -166,34 +175,43 @@ var logText;
           // -------------------------------------------------------------------
           // on 'show'
           // -------------------------------------------------------------------
-          $('#docsearch_container').on('show.bs.modal', function () {
+          $('#docsearch_container').on('show.bs.modal', () => {
+
             //
             // place code here
             //
+
           }); // END modal on 'show'
 
           // -------------------------------------------------------------------
           // on 'shown'
           // -------------------------------------------------------------------
-          $('#docsearch_container').on('shown.bs.modal', function () {
+          $('#docsearch_container').on('shown.bs.modal', () => {
+
             //
             // place code here
             //
+
           }); // END modal on 'shown'
 
           // -------------------------------------------------------------------
           // on 'hidden' (close)
           // -------------------------------------------------------------------
-          $('#docsearch_container').on('hidden.bs.modal', function () {
+          $('#docsearch_container').on('hidden.bs.modal', () => {
+
             //
             // do something here
             //
+
           }); // END modal on 'hidden'
 
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module initialization finished');
 
+          endTimeModule = Date.now();
+          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
           clearInterval(dependencies_met_page_ready);
         } // END if
       }, 10); // END dependencies_met_page_ready
@@ -203,7 +221,7 @@ var logText;
     // showDialog()
     // display the dialog
     // -------------------------------------------------------------------------
-    showDialog: function () {
+    showDialog: () => {
       logger.debug('\n' + "showDialog");
 
       $('#docsearch_container').modal({
@@ -219,24 +237,26 @@ var logText;
     // 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;
@@ -244,9 +264,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
 
@@ -254,11 +274,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 %}