j1-template 2024.1.5 → 2024.2.1

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

@@ -83,32 +83,41 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.attic = (function (j1, window) {
+j1.adapter.attic = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
   var state         = 'not_started';
   var moduleOptions = {};
-  var _this;
-  var logger;
-  var logText;
+
   var atticFilters;
   var filterArray;
   var filterStr;
 
+  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.attic',
@@ -116,7 +125,7 @@ j1.adapter.attic = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.attic;
       logger  = log4javascript.getLogger('j1.adapter.attic');
@@ -132,23 +141,26 @@ j1.adapter.attic = (function (j1, window) {
       var atticSettings = $.extend({}, {{attic_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
       var atticOptions  = $.extend(true, {}, atticDefaults, atticSettings, frontmatterOptions);
 
-      // Save frontmatterOptions and atticOptions in the j1 namespace
+      // save frontmatterOptions and atticOptions in the j1 namespace
       // to be used later by j1.template.init() to load the header
       //
       _this['frontmatterOptions'] = frontmatterOptions;
       _this['atticOptions']       = atticOptions;
 
-      _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
-      var dependencies_met_page_ready = setInterval (function (options) {
+      // -----------------------------------------------------------------------
+      // adapter initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_page_ready = setInterval (() => {
         var pageState   = $('#no_flicker').css("display");
-        var pageVisible = (pageState == 'block') ? true: false;
+        var pageVisible = (pageState === 'block') ? true: false;
 
-        // run on 'pageVisible'
-        //
         if (pageVisible) {
+          startTimeModule = Date.now();
+
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
+
           {% if attic_options.enabled %}
           logger.info('\n' + 'module initializaton: started');
 
@@ -166,7 +178,7 @@ j1.adapter.attic = (function (j1, window) {
           {% else %}
           logger.warn('\n' + 'found module attics disabled');
           // add additional top space if attics are disabled
-          $('#content').addClass('mt-5');
+          $('#no_flicker').addClass('mt-5');
           clearInterval(dependencies_met_page_ready);
           {% endif %}
         }
@@ -174,9 +186,10 @@ j1.adapter.attic = (function (j1, window) {
     }, // END init
 
     // -------------------------------------------------------------------------
-    // Initialize all header supported
+    // createAllAttics()
+    // initialize all header supported
     // -------------------------------------------------------------------------
-    createAllAttics: function () {
+    createAllAttics: () => {
       var frontmatterOptions  = _this.frontmatterOptions;
 
       // merge all attic options
@@ -188,8 +201,7 @@ j1.adapter.attic = (function (j1, window) {
         {% if item.attic.enabled %}
           {% assign attic_id = item.attic.id %}
 
-          // Create RUNNER for id: {{attic_id}}
-          //
+          // create RUNNER for id: {{attic_id}}
           function {{attic_id}}_runner (atticOptions) {
             var atticOptionsFilters = {};
             var atticItemFilters    = {};
@@ -206,14 +218,13 @@ j1.adapter.attic = (function (j1, window) {
             atticFilters        = $.extend(true, {}, atticOptionsFilters, atticItemFilters);
             filterArray         = [];
 
-            $.each(atticFilters, function(idx2, val2) {
+            $.each(atticFilters, (idx2, val2) => {
               var str = idx2 + '(' + val2 + ')';
               filterArray.push(str);
             });
             filterStr = filterArray.join(' ');
 
             // fire backstretch for all slides on attic_id
-            //
             if ($('#{{attic_id}}').length) {
               $('#{{attic_id}}').backstretch(
                 atticOptions.slides, {
@@ -248,36 +259,34 @@ j1.adapter.attic = (function (j1, window) {
               $('.backstretch').addClass(atticOptions.spinner);
             }
 
-            // Collect backstretch instance data for Backstretch callbacks
+            // collect backstretch instance data for Backstretch callbacks
             var backstretch_instance_data = $('#{{attic_id}}').data('backstretch');
 
-            // Add event for pauseOnHover
-            //
+            // add event for pauseOnHover
             if (atticOptions.pauseOnHover) {
               $('#attic_id').hover (
-                function() {
+                () => {
                   $('#{{attic_id}}').backstretch('pause'); },
-                function() {
+                () => {
                   $('#{{attic_id}}').backstretch('resume'); }
               );
             }
 
-            // run callback backstretch.before
-            //
-            $(window).on('backstretch.before', function (e, instance, index) {
-              var evt                 = e;
-              var inst                = instance;
-              var idx                 = index;
-              var atticOptions        = _this.atticOptions;
-              var textOverlayTitle    = instance.images[index].title
-              var textOverlayTagline  = instance.images[index].tagline;
+            // run callback backstretch before
+            $(window).on('backstretch.before', (e, instance, index) => {
+              var evt                = e;
+              var inst               = instance;
+              var idx                = index;
+              var atticOptions       = _this.atticOptions;
+              var textOverlayTitle   = instance.images[index].title
+              var textOverlayTagline = instance.images[index].tagline;
               var textOverlayHTML;
 
               // console.log('module attic - set state: backstretch_before');
               _this.setState('backstretch_before');
 
               if (index === backstretch_instance_data.images.length -1) {
-                if (atticOptions.circuit == false) {
+                if (atticOptions.circuit === false) {
                   // Stop the slideshow after reached the last image
                   $('#{{attic_id}}').backstretch('pause');
                 }
@@ -305,7 +314,7 @@ j1.adapter.attic = (function (j1, window) {
             // NOTE: add a 'caption' or 'badge' if configured
             // SEE:  https://github.com/jquery-backstretch/jquery-backstretch/issues/194
             //
-            $(window).on('backstretch.after', function (e, instance, index) {
+            $(window).on('backstretch.after', (e, instance, index) => {
               var textOverlayTitle    = instance.images[index].title
               var textOverlayTagline  = instance.images[index].tagline;
               var atticOptions        = _this.atticOptions;
@@ -315,11 +324,11 @@ j1.adapter.attic = (function (j1, window) {
               // apply FRONTMATTER settings for title|tagline if
               // NOT set with the FIRST backstretch (image) instance
               //
-              if (index == 0) {
-                if (typeof instance.images[index].title == 'undefined') {
+              if (index === 0) {
+                if (typeof instance.images[index].title === 'undefined') {
                   textOverlayTitle    = frontmatterOptions.title;
                 }
-                if (typeof instance.images[index].tagline == 'undefined') {
+                if (typeof instance.images[index].tagline === 'undefined') {
                   textOverlayTagline  = frontmatterOptions.tagline;
                 }
               }
@@ -367,7 +376,6 @@ j1.adapter.attic = (function (j1, window) {
               }
 
               // TODO: Add additional styles to head-title-text|head-tagline (e.g. text-center)
-              //
               textOverlayHTML = ''
                 + '<div id="head-title" class="head-title animate__animated ">'
                 + '  <h2 id="head-title-text" class="notoc text-' + atticOptions.title_align + ' text-emphasis-stronger">' + textOverlayTitle + '</h2>'
@@ -377,11 +385,9 @@ j1.adapter.attic = (function (j1, window) {
                 + '</div>';
 
               // hide textOverlay while animate classes are being applied
-              //
               $('.textOverlay').html(textOverlayHTML).hide();
 
               // collect individual title options
-              //
               var title_animate             = !!my_attic.title_animate ? my_attic.title_animate : atticOptions.title_animate;
               var title_animate_delay       = !!my_attic.title_animate_delay ? my_attic.title_animate_delay : atticOptions.title_animate_delay;
               var title_animate_duration    = !!my_attic.title_animate_duration ? my_attic.title_animate_duration : atticOptions.title_animate_duration;
@@ -391,7 +397,6 @@ j1.adapter.attic = (function (j1, window) {
               $('#head-title').addClass(title_animate_duration);
 
               // collect individual tagline options
-              //
               var tagline_animate           = !!my_attic.tagline_animate ? my_attic.tagline_animate : atticOptions.tagline_animate;
               var tagline_animate_delay     = !!my_attic.tagline_animate_delay ? my_attic.tagline_animate_delay : atticOptions.tagline_animate_delay;
               var tagline_animate_duration  = !!my_attic.tagline_animate_duration ? my_attic.tagline_animate_duration : atticOptions.tagline_animate_duration;
@@ -401,19 +406,16 @@ j1.adapter.attic = (function (j1, window) {
               $('#head-tagline').addClass(tagline_animate_duration);
 
               // show configured textOverlay
-              //
               $('.textOverlay').show();
               $('.textOverlay').css('opacity', '1');
 
               // jadams, 2022-08-19: show a badge only if configured
-              //
               if (typeof instance.images[index].badge != 'undefined') {
                 $('.attic-caption').show();
                 $('.attic-caption').css('opacity', '1');
               }
 
               // show page if attic finalized
-              //
               $('#no_flicker').css('display', 'block');
 
               // jadams, 2022-08-09:
@@ -426,15 +428,15 @@ j1.adapter.attic = (function (j1, window) {
 
              _this.setState('finished');
              logger.debug('\n' + 'state: ' + _this.getState());
-              logger.info('\n' + 'initialize attic on id {{attic_id}}: finished');
+             logger.info('\n' + 'initialize attic on id {{attic_id}}: finished');
              logger.info('\n' + 'module initializaton: finished');
 
+             endTimeModule = Date.now();
+             logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
             }); // END callback backstretch.after
-
           } // END if attic_id exists
 
           // run attic found in page: {{attic_id}}
-          //
           if ($('#{{attic_id}}').length) {
             // apply CSS styles
             // NOTE: unclear why title_size|tagline_size evaluated to 1 if NOT set
@@ -595,7 +597,7 @@ j1.adapter.attic = (function (j1, window) {
 
             // add r-text|raised_level settings
             //
-            if (atticOptions.r_text == 'enabled') { $('#{{attic_id}}').addClass('r-text'); }
+            if (atticOptions.r_text === 'enabled') { $('#{{attic_id}}').addClass('r-text'); }
             var raised_level = 'raised-z' +atticOptions.raised_level;
 
             $('#{{attic_id}}').addClass(raised_level);
@@ -662,8 +664,8 @@ j1.adapter.attic = (function (j1, window) {
 
             // start RUNNER on page 'ready'|module state 'initialized'
             //
-            $(function() {
-              var dependencies_met_attic_ready = setInterval (function (options) {
+            $(() => {
+              var dependencies_met_attic_ready = setInterval (() => {
                 if (_this.getState() === 'initialized') {
                   logger.info('\n' + 'initialize attic on id {{attic_id}}: started');
                   {{attic_id}}_runner (atticOptions);
@@ -683,7 +685,7 @@ j1.adapter.attic = (function (j1, window) {
 
           // add additional top space if attic disabled
           //
-          $('#content').addClass('mt-3');
+          $('#no_flicker').addClass('mt-3');
 
           logger.warn('\n' + 'attic on id {{attic_id}}: disabled');
           $('#no_flicker').css('display', 'block');
@@ -699,28 +701,32 @@ j1.adapter.attic = (function (j1, window) {
 
       return true;
 
-    }, // END apply CSS styles|start ATTIC RUNNER
+    }, // END createAllAttics
 
     // -------------------------------------------------------------------------
-    // 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') {
-        status = 'completed';
+
+        //
+        // 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;
@@ -728,9 +734,9 @@ j1.adapter.attic = (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
 
@@ -738,11 +744,11 @@ j1.adapter.attic = (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/bmd.js

@@ -60,33 +60,41 @@ regenerate:                             false
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.bmd = (function (j1, window) {
+j1.adapter.bmd = ((j1, window) => {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
   var moduleOptions = {};
   var state         = 'not_started';
+
   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.bmd',
@@ -94,56 +102,66 @@ j1.adapter.bmd = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.bmd;
       logger  = log4javascript.getLogger('j1.adapter.bmd');
 
-      var dependencies_met_j1_finished = setInterval(function() {
-        if (j1.getState() == 'finished') {
+      // -----------------------------------------------------------------------
+      // module initializer
+      // -----------------------------------------------------------------------
+      var dependency_met_page_ready = setInterval(() => {
+        var pageState      = $('#content').css("display");
+        var pageVisible    = (pageState === 'block') ? true : false;
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
+
+        if (j1CoreFinished && pageVisible) {
+          startTimeModule = Date.now();
 
-          // initialize state flag
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          var log_text = '\n' + 'BMD is being initialized';
-          logger.info(log_text);
-
           // BMD initializer
+          logger.info('\n' + 'setup bmd resources');
           $('body').bmd();
 
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'initializing module finished');
-          clearInterval(dependencies_met_j1_finished);
-        } // END dependencies_met_j1_finished
-      }, 10);
 
+          endTimeModule = Date.now();
+          logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
+          clearInterval(dependency_met_page_ready);
+        } // END if pageVisible
+      }, 10); // END dependency_met_page_ready
     }, // 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;
@@ -151,9 +169,9 @@ j1.adapter.bmd = (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
 
@@ -161,11 +179,11 @@ j1.adapter.bmd = (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 %}