j1-template 2024.1.5 → 2024.2.0

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

@@ -83,28 +83,36 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.rtextResizer = (function (j1, window) {
+j1.adapter.rtextResizer = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment = '{{environment}}';
   var state       = 'not_started';
+
   var _this;
   var logger;
   var logText;
 
+  // date|time
+  var startTime;
+  var endTime;
+  var startTimeModule;
+  var endTimeModule;
+  var timeSeconds;
+
   // ---------------------------------------------------------------------------
-  // 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.rtextResizer',
@@ -112,18 +120,13 @@ j1.adapter.rtextResizer = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.rtextResizer;
       logger  = log4javascript.getLogger('j1.adapter.rtextResizer');
 
-      // initialize state flag
-      _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
       // -----------------------------------------------------------------------
-      // data loader
+      // data loader (resizer UI)
       // -----------------------------------------------------------------------
       j1.loadHTML ({
         xhr_container_id:   'rtext_resizer_container',
@@ -134,17 +137,23 @@ j1.adapter.rtextResizer = (function (j1, window) {
       );
 
       // -----------------------------------------------------------------------
-      // initializer
+      // module initializer
       // -----------------------------------------------------------------------
-      var dependencies_met_data_loaded = setInterval(function() {
-        var logger = log4javascript.getLogger('j1.adapter.rtextResizer');
+      var dependencies_met_data_loaded = setInterval(() => {
+        var pageState            = $('#content').css("display");
+        var pageVisible          = (pageState === 'block') ? true : false;
+        var j1CoreFinished       = (j1.getState() === 'finished') ? true : false;
+        var rtextContainerLoaded = (j1.xhrDOMState['#rtext_resizer_container'] == 'success') ? true : false;
 
-        if (j1.xhrDOMState['#rtext_resizer_container'] == 'success') {
-          var $modalContainer = $('#rtext_resizer_modal');
+        if (rtextContainerLoaded) {
+          startTimeModule = Date.now();
 
-          logger.info('\n' + 'loading rtext resizer modal finished on id: #' + 'rtext_resizer');
-          logger.info('\n' + 'initialize resizer ui');
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
 
+          logger.info('\n' + 'initialize resizer ui');
+          var $modalContainer = $('#rtext_resizer_modal');
           if ($modalContainer.length) {
             var environment     = '{{environment}}';
             var logger          = log4javascript.getLogger('j1.template.rtext-resizer');
@@ -157,11 +166,12 @@ j1.adapter.rtextResizer = (function (j1, window) {
             var value;
 
             $('input:checkbox[name="textsize-300"]').on('click', function (e) {
-              value = $(this).is(':checked');
+              e.stopPropagation();
 
               $('input:checkbox[name="textsize-400"]').prop('checked', false);
               $('input:checkbox[name="textsize-500"]').prop('checked', false);
 
+              value = $(this).is(':checked');
               if (value == true) {
                 cl = r_text_default;
               }
@@ -171,15 +181,15 @@ j1.adapter.rtextResizer = (function (j1, window) {
                 logText = 'Changed textsize to: ' +cl;
                 logger.info(logText);
               }
-              e.stopPropagation();
-            });
+            }); // END textsize-300 on click
 
             $('input:checkbox[name="textsize-400"]').on('click', function (e) {
-              value = $(this).is(':checked');
+              e.stopPropagation();
 
               $('input:checkbox[name="textsize-300"]').prop('checked', false);
               $('input:checkbox[name="textsize-500"]').prop('checked', false);
 
+              value = $(this).is(':checked');
               if (value == true) {
                 cl = r_text_larger;
               }
@@ -189,15 +199,15 @@ j1.adapter.rtextResizer = (function (j1, window) {
                 logText = 'Changed textsize to: ' +cl;
                 logger.info(logText);
               }
-              e.stopPropagation();
-            });
+            }); // END textsize-400 on click
 
             $('input:checkbox[name="textsize-500"]').on('click', function (e) {
-              value = $(this).is(':checked');
+              e.stopPropagation();
 
               $('input:checkbox[name="textsize-300"]').prop('checked', false);
               $('input:checkbox[name="textsize-400"]').prop('checked', false);
 
+              value = $(this).is(':checked');
               if (value == true) {
                 cl = r_text_largest;
               }
@@ -207,42 +217,45 @@ j1.adapter.rtextResizer = (function (j1, window) {
                 logText = 'Changed textsize to: ' +cl;
                 logger.info(logText);
               }
-              e.stopPropagation();
-            });
-
-          } // END form events
-          clearInterval(dependencies_met_data_loaded);
+            }); // END textsize-500 on click
+          } // END if $modalContainer
 
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'initializing module finished');
-          logger.debug('\n' + 'met dependencies for: loadHTML');
-        } // END dependencies_met_data_loaded
-      }, 10);
+
+          endTimeModule = Date.now();
+          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
+          clearInterval(dependencies_met_data_loaded);
+        } // END if rtextContainerLoaded
+      }, 10); // END dependencies_met_data_loaded
     }, // END init
 
     // -------------------------------------------------------------------------
-    // messageHandler: MessageHandler for J1 CookieConsent module
-    // 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;
@@ -250,9 +263,9 @@ j1.adapter.rtextResizer = (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
 
@@ -260,11 +273,11 @@ j1.adapter.rtextResizer = (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/scroller.js

@@ -84,35 +84,43 @@ TODO: Check|Fix the (Liquid) merge issue for scroller_options
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.scroller = (function (j1, window) {
-
-{% comment %} Set global variables
--------------------------------------------------------------------------------- {% endcomment %}
-var environment   = '{{environment}}';
-var language      = '{{site.language}}';
-var user_agent    = platform.ua;
-var state         = 'not_started';
-var scrollerDefaults;
-var scrollerSettings;
-var scrollerOptions;
-var _this;
-var logger;
-var logText;
-var lastPageInfo;
+j1.adapter.scroller = ((j1, window) => {
+
+  {% comment %} Set global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var environment   = '{{environment}}';
+  var language      = '{{site.language}}';
+  var user_agent    = platform.ua;
+  var state         = 'not_started';
+
+  var scrollerDefaults;
+  var scrollerSettings;
+  var scrollerOptions;
+  var lastPageInfo;
+
+  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.scroller',
@@ -120,162 +128,191 @@ var lastPageInfo;
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
-      _this = j1.adapter.scroller;
-      logger = log4javascript.getLogger('j1.adapter.scroller');
+      _this   = j1.adapter.scroller;
+      logger  = log4javascript.getLogger('j1.adapter.scroller');
 
-      // load  module DEFAULTS|CONFIG
-      //
+      // load module DEFAULTS|CONFIG
       scrollerDefaults = $.extend({}, {{scroller_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
       scrollerSettings = $.extend({}, {{scroller_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
       scrollerOptions  = $.extend(true, {}, scrollerDefaults, scrollerSettings);
 
       // initialize state flag
-      //
       _this.setState('started');
       logger.debug('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      var dependencies_met_page_ready = setInterval (function (options) {
-        var contentState    = $('#content').css("display");
-        var ContentVisible  = (contentState == 'block') ? true: false;
+      // -----------------------------------------------------------------------
+      // 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 atticFinished   = (j1.adapter.attic.getState() == 'finished') ? true : false;
 
-        // initialize scrollers if content is fully available|visible
-        //
-        if (j1.getState() === 'finished' && ContentVisible) {
+        if (j1CoreFinished && pageVisible && atticFinished) {
+          startTimeModule = Date.now();
+
+          _this.setState('started');
+          logger.debug('\n' + 'set module state to: ' + _this.getState());
+          logger.info('\n' + 'initializing module: started');
+
+          logger.info('\n' + 'initialize scrollers');
           _this.generate_scrollers();
-          _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module initialized successfully');
-          clearInterval(dependencies_met_page_ready);
-        }
-      }, 10);
 
+          clearInterval(dependencies_met_page_ready);
+        } // END if pageVisible
+      }, 10); // END dependency_met_page_ready
     }, // END init
 
     // -------------------------------------------------------------------------
     // generate_scrollers()
     // generate scrollers configured|enabled
     // -------------------------------------------------------------------------
-    generate_scrollers: function () {
-      logger = log4javascript.getLogger('j1.adapter.scroller');
+    generate_scrollers: () => {
 
-      logText = '\n' + 'scrollers are being initialized';
-      logger.info(logText);
+      var wrapper_dependencies = {};
+      var dependency;
 
       {% comment %} generate scrollers of type 'infiniteScroll'
       -------------------------------------------------------------------------- {% endcomment %}
 
       {% for item in scroller_options.scrollers %} {% if item.scroller.enabled %}
-
-      {% if item.scroller.type == 'infiniteScroll' %}
-
-      {% assign scroller_id     = item.scroller.id %}
-      {% assign scroller_type   = item.scroller.type %}
-      {% assign container       = item.scroller.container %}
-      {% assign pagePath        = item.scroller.pagePath  %}
-      {% assign elementScroll   = item.scroller.elementScroll %}
-      {% assign scrollOffset    = item.scroller.scrollOffset %}
-      {% assign lastPage        = item.scroller.lastPage %}
-      {% assign infoLastPage    = item.scroller.infoLastPage %}
-      {% assign lastPageInfo_en = item.scroller.lastPageInfo_en %}
-      {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
-
-      // scroller_id: {{ scroller_id }}
-      //
-      logText = '\n' + 'scroller of type {{item.scroller.type}} is being initialized on: ' + '{{scroller_id}}';
-      logger.info(logText);
-
-      var container = '#' + '{{container}}';
-      var pagePath  = '{{pagePath}}';
-
-      if (language === 'en') {
-        lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
-        lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
-        lastPageInfo += '</p></div>';
-      } else if (language === 'de') {
-        lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
-        lastPageInfo += '{{lastPageInfo_de|strip_newlines}}';
-        lastPageInfo += '</p></div>';
-      } else {
-        lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
-        lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
-        lastPageInfo += '</p></div>';
-      }
-
-      // create an (scroller) instance of 'infiniteScroll'
-      //
-      if ($(container).length) {
-        $(container).scroller({
-          id:             '{{scroller_id}}',
-          type:           '{{scroller_type}}',
-          pagePath:       '{{pagePath}}',
-          elementScroll:  {{elementScroll}},
-          scrollOffset:   {{scrollOffset}},
-          lastPage:       {{lastPage}},
-          infoLastPage:   {{infoLastPage}},
-          lastPageInfo:   lastPageInfo,
-        });
-      }
-
-      {% endif %}
-
-      {% if item.scroller.type == 'showOnScroll' %}
-
-      {% assign scroller_id     = item.scroller.id %}
-      {% assign scroller_type   = item.scroller.type %}
-      {% assign container       = item.scroller.container %}
-      {% assign showDelay       = item.scroller.showDelay %}
-      {% assign scrollOffset    = item.scroller.scrollOffset  %}
-
-      var container = '#' + '{{container}}';
-
-      // scroller_id: {{ scroller_id }}
-      //
-      logText = '\n' + 'scroller of type {{item.scroller.type}} is being initialized on: ' + '{{scroller_id}}';
-      logger.info(logText);
-
-      // create an (scroller) instance of 'showOnScroll'
-      //
-      if ($(container).length) {
-        $(container).scroller({
-          id:             '{{scroller_id}}',
-          type:           '{{scroller_type}}',
-          container:      '{{container}}',
-          showDelay:      {{showDelay}},
-          scrollOffset:   {{scrollOffset}},
-        });
-      }
-
-      {% endif %}
-      // END scroller_id: {{ scroller_id }}
+      logger.info('\n' + 'scroller {{item.scroller.id}} is being initialized on wrapper: {{item.scroller.container}}');
+
+      // create dynamic loader variable to setup
+      dependency = 'dependency_met_wrapper_ready_{{item.scroller.container}}';
+      wrapper_dependencies[dependency] = '';
+
+      wrapper_dependencies['dependency_met_wrapper_ready_{{item.scroller.container}}'] = setInterval(() => {
+        var scrollerID     = document.getElementById('{{item.scroller.container}}');
+        var scrollerExists = (scrollerID !== undefined || scrollerID !== null ) ? true: false;
+
+        // process the wrapper if extsts
+        if (scrollerExists) {
+          {% if item.scroller.type == 'infiniteScroll' %}
+
+          {% assign scroller_id     = item.scroller.id %}
+          {% assign scroller_type   = item.scroller.type %}
+          {% assign container       = item.scroller.container %}
+          {% assign pagePath        = item.scroller.pagePath  %}
+          {% assign elementScroll   = item.scroller.elementScroll %}
+          {% assign scrollOffset    = item.scroller.scrollOffset %}
+          {% assign lastPage        = item.scroller.lastPage %}
+          {% assign infoLastPage    = item.scroller.infoLastPage %}
+          {% assign lastPageInfo_en = item.scroller.lastPageInfo_en %}
+          {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
+
+          var container = '#' + '{{container}}';
+          var pagePath  = '{{pagePath}}';
+
+          var dependencies_met_container_exists = setInterval(() => {
+            var containerExists = ($(container).length) ? true : false;
+
+              if (containerExists) {
+                // create an (scroller) instance of infiniteScroll
+                logText = '\n' + 'scroller of type {{item.scroller.type}} initialized on: ' + '{{scroller_id}}';
+                logger.info(logText);
+
+                if (language === 'en') {
+                  lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+                  lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+                  lastPageInfo += '</p></div>';
+                } else if (language === 'de') {
+                  lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+                  lastPageInfo += '{{lastPageInfo_de|strip_newlines}}';
+                  lastPageInfo += '</p></div>';
+                } else {
+                  lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+                  lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+                  lastPageInfo += '</p></div>';
+                }
+
+                $(container).scroller({
+                  id:             '{{scroller_id}}',
+                  type:           '{{scroller_type}}',
+                  pagePath:       '{{pagePath}}',
+                  elementScroll:  {{elementScroll}},
+                  scrollOffset:   {{scrollOffset}},
+                  lastPage:       {{lastPage}},
+                  infoLastPage:   {{infoLastPage}},
+                  lastPageInfo:   lastPageInfo,
+                });
+
+                _this.setState('finished');
+                logger.debug('\n' + 'state: ' + _this.getState());
+                logger.info('\n' + 'module initialized successfully');
+
+                endTimeModule = Date.now();
+                logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
+                clearInterval(dependencies_met_container_exists);
+            } // END containerExists
+          }, 10); // END dependencies_met_container_exists
+
+          {% endif %}
+
+          {% if item.scroller.type == 'showOnScroll' %}
+
+          {% assign scroller_id     = item.scroller.id %}
+          {% assign scroller_type   = item.scroller.type %}
+          {% assign container       = item.scroller.container %}
+          {% assign showDelay       = item.scroller.showDelay %}
+          {% assign scrollOffset    = item.scroller.scrollOffset  %}
+
+          var container = '#' + '{{container}}';
+
+          // scroller_id: {{ scroller_id }}
+          logText = '\n' + 'scroller of type {{item.scroller.type}} initialized on: ' + '{{scroller_id}}';
+          logger.info(logText);
+
+          // create an (scroller) instance of 'showOnScroll'
+          if ($(container).length) {
+            $(container).scroller({
+              id:             '{{scroller_id}}',
+              type:           '{{scroller_type}}',
+              container:      '{{container}}',
+              showDelay:      {{showDelay}},
+              scrollOffset:   {{scrollOffset}},
+            });
+          }
+
+          {% endif %}
+          // END scroller_id: {{ scroller_id }}
+
+          clearInterval(wrapper_dependencies['dependency_met_wrapper_ready_{{item.scroller.container}}']);
+        } // END if scrollerExists
+      }, 10); // END dependencies_met_scroller_exists
       {% endif %} {% endfor %}
-      // END generate scrollers
-    },
+
+    }, // END generate scrollers
 
     // -------------------------------------------------------------------------
     // 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;
@@ -283,9 +320,9 @@ var lastPageInfo;
 
     // -------------------------------------------------------------------------
     // 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
 
@@ -293,11 +330,11 @@ var lastPageInfo;
     // 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 %}