j1-template 2024.1.5 → 2024.2.1

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

@@ -76,33 +76,41 @@ regenerate:                             false
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.algolia = (function (j1, window) {
+j1.adapter.algolia = ((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
+    // module initializer
     // -------------------------------------------------------------------------
-    init: function (options) {
+    init: (options) => {
 
       // -----------------------------------------------------------------------
-      // Default module settings
+      // default module settings
       // -----------------------------------------------------------------------
       var settings = $.extend({
         module_name: 'j1.adapter.algolia',
@@ -110,19 +118,18 @@ j1.adapter.algolia = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.algolia;
       logger  = log4javascript.getLogger('j1.adapter.algolia');
 
-      // initialize state flag
-      _this.state = 'pending';
+      startTimeModule = Date.now();
 
       _this.setState('started');
       logger.debug('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      {% comment %} Load module config from yml data
+      {% comment %} Load module config from yaml data file
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       /* eslint-disable */
@@ -140,21 +147,16 @@ j1.adapter.algolia = (function (j1, window) {
         routing:    true
       });
 
-      var hitTemplate = function(hit) {
-        // state = 'start search';
-        // logger.debug('\n' + 'state: ' + state);
-        // var re = new RegExp('^\/posts');
-        // var re = new RegExp('^\/pages');
+      var hitTemplate = (hit) => {
         var re = new RegExp('^\/pages|^\/posts|^\/collections');
         if (re.test(hit.url)) {
           var date = '';
           if (hit.date) {
             date = moment.unix(hit.date).format('MMM D, YYYY');
           }
-          // var url = `/jekyll-algolia-example${hit.url}#${hit.anchor}`;
-          var url = hit.url;
 
-          const title = hit._highlightResult.title.value;
+          var url         = hit.url;
+          const title     = hit._highlightResult.title.value;
           var breadcrumbs = '';
 
           if (hit._highlightResult.headings) {
@@ -181,6 +183,7 @@ j1.adapter.algolia = (function (j1, window) {
             </li>
           `;
         }
+
         // state = 'finished search';
         // logger.debug('\n' + 'state: ' + state);
       };
@@ -201,7 +204,7 @@ j1.adapter.algolia = (function (j1, window) {
           instantsearch.widgets.clearAll({
             container: '#clear-all',
             templates: {
-              link: 'Reset TAGS'
+              link:    'Reset TAGS'
             },
             clearsQuery: false,
             autoHideContainer: false
@@ -211,21 +214,21 @@ j1.adapter.algolia = (function (j1, window) {
         // initialize pagination
         search.addWidget(
           instantsearch.widgets.pagination({
-            container: '#pagination',
-            maxPages: 20,
+            container:  '#pagination',
+            maxPages:   20,
             // default is to scroll to 'body', here we disable this behavior
-            scrollTo: false
+            scrollTo:   false
           })
         );
         // initialize SearchBox
         search.addWidget(
           instantsearch.widgets.searchBox({
-            container:            '#search-searchbar',
-            placeholder:          'Search this site ..',
-            autofocus:            true,
-            reset:                true,
-            loadingIndicator:     false,
-            poweredBy:            true // This is required if you're on the free Community plan
+            container:        '#search-searchbar',
+            placeholder:      'Search this site ..',
+            autofocus:        true,
+            reset:            true,
+            loadingIndicator: false,
+            poweredBy:        true // This is required if you're on the free Community plan
           })
         );
         // initialize hits widget
@@ -241,33 +244,33 @@ j1.adapter.algolia = (function (j1, window) {
         // initialize RefinementList
         search.addWidget(
           instantsearch.widgets.refinementList({
-            container:        '#refinement-list',
-            attributeName:    'tags',
-            collapsible:      true,
-            operator:         'and',
-            limit:            5,
-            sortBy:           ['isRefined','count:desc','name:asc'],
+            container:      '#refinement-list',
+            attributeName:  'tags',
+            collapsible:    true,
+            operator:       'and',
+            limit:          5,
+            sortBy:         ['isRefined','count:desc','name:asc'],
             templates: {
-              header:         'Tags'
+              header:       'Tags'
             },
-            showMore:         true
-          })
-        );
-        /*
-        search.addWidget(
-          instantsearch.widgets.hitsPerPageSelector({
-            container: '#hits-per-page-selector',
-            items: [
-              {value: 3, label: '3 per page', default: true},
-              {value: 6, label: '6 per page'},
-              {value: 12, label: '12 per page'},
-            ]
+            showMore:       true
           })
         );
-        */
-      }
 
-      if (moduleOptions.enabled == true) {
+        // search.addWidget(
+        //   instantsearch.widgets.hitsPerPageSelector({
+        //     container: '#hits-per-page-selector',
+        //     items: [
+        //       {value: 3, label: '3 per page', default: true},
+        //       {value: 6, label: '6 per page'},
+        //       {value: 12, label: '12 per page'},
+        //     ]
+        //   })
+        // );
+
+      } // END if moduleOptions enabled
+
+      if (moduleOptions.enabled === true) {
         search.start();
         $('#searcher').addClass('row');
 
@@ -275,12 +278,14 @@ j1.adapter.algolia = (function (j1, window) {
         logger.debug('\n' + 'state: ' + _this.getState());
         logger.info('\n' + 'module initialized successfully');
 
+        endTimeModule = Date.now();
+        logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
       } else {
         $('#algolia-site-search').append('<p class="ml-5 mt-5 mb-5 "> <strong>Algolia Search DISABLED</strong> </p>');
         _this.setState('finished');
         logger.debug('\n' + 'state: ' + _this.getState());
         logger.warn('\n' + 'module disabled');
-      }
+      } // END if moduleOptions enabled
 
       return true;
     }, // END init
@@ -289,7 +294,7 @@ j1.adapter.algolia = (function (j1, window) {
     // messageHandler: MessageHandler for J1 CookieConsent module
     // 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;
@@ -299,9 +304,11 @@ j1.adapter.algolia = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
+
         //
         // Place handling of command|action here
         //
+
         logger.info('\n' + message.text);
       }
 
@@ -316,7 +323,7 @@ j1.adapter.algolia = (function (j1, window) {
     // setState()
     // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function (stat) {
+    setState: (stat) => {
       _this.state = stat;
     }, // END setState
 
@@ -324,7 +331,7 @@ j1.adapter.algolia = (function (j1, window) {
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
-    getState: function () {
+    getState: () => {
       return _this.state;
     } // END getState
 

data/assets/themes/j1/adapter/js/analytics.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 %}
@@ -62,7 +62,6 @@ regenerate:                             true
 
 {% comment %} analytics_options:  {{ analytics_options | debug }} {% endcomment %}
 
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/analytics.js
@@ -86,50 +85,62 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.analytics = (function (j1, window) {
-
-{% comment %} Set global variables
--------------------------------------------------------------------------------- {% endcomment %}
-var url               = new liteURL(window.location.href);
-var hostname          = url.hostname;
-var environment       = '{{environment}}';
-var gaScript          = document.createElement('script');
-var cookie_names      = j1.getCookieNames();
-var date              = new Date();
-var timestamp_now     = date.toISOString();
-var skipHost          = false;
-var state             = 'not_started';
-var analyticsDefaults;
-var analyticsSettings;
-var analyticsOptions;
-var providerID;
-var skipAllHosts;
-var optInOut;
-var anonymizeIP;
-var validProviderID;
-var skipHosts;
-var gaCookies;
-var user_consent;
-var gaExists;
-var _this;
-var logger;
-var logText;
+j1.adapter.analytics = ((j1, window) => {
+
+  {% comment %} Set global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var url               = new liteURL(window.location.href);
+  var hostname          = url.hostname;
+  var environment       = '{{environment}}';
+  var gaScript          = document.createElement('script');
+  var cookie_names      = j1.getCookieNames();
+  var date              = new Date();
+  var timestamp_now     = date.toISOString();
+  var skipHost          = false;
+  var state             = 'not_started';
+  var analyticsDefaults;
+  var analyticsSettings;
+  var analyticsOptions;
+  var providerID;
+  var skipAllHosts;
+  var optInOut;
+  var anonymizeIP;
+  var validProviderID;
+  var skipHosts;
+  var gaCookies;
+  var user_consent;
+  var gaExists;
+
+  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) => {
+
+      // -----------------------------------------------------------------------
+      // 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 dependencies_met_page_ready = setInterval (function (options) {
-        var pageState   = $('#no_flicker').css("display");
-        var pageVisible = (pageState == 'block') ? true: false;
-        if ( j1.getState() === 'finished' && pageVisible ) {
+        if (j1CoreFinished && pageVisible) {
           {% if analytics %}
 
             // Load  module DEFAULTS|CONFIG
@@ -149,7 +160,7 @@ var logText;
             validProviderID   = (providerID.includes('your')) ? false : true;
 
             // -----------------------------------------------------------------
-            // Default module settings
+            // default module settings
             // -----------------------------------------------------------------
             var settings = $.extend({
               module_name: 'j1.adapter.analytics',
@@ -157,12 +168,13 @@ var logText;
             }, options);
 
             // -----------------------------------------------------------------
-            // Global variable settings
+            // global variable settings
             // -----------------------------------------------------------------
-            _this = j1.adapter.analytics;
+            _this  = j1.adapter.analytics;
             logger = log4javascript.getLogger('j1.adapter.analytics');
 
-            // initialize state flag
+            startTimeModule = Date.now();
+
             _this.setState('started');
             logger.debug('\n' + 'state: ' + _this.getState());
             logger.info('\n' + 'module initializing: started');
@@ -171,13 +183,9 @@ var logText;
             // session/page view if they exists
             // -----------------------------------------------------------------
             gaCookies = j1.findCookie('_ga');
-            gaCookies.forEach(function (item) {
+            gaCookies.forEach((item) => {
               logger.debug('\n' + 'delete cookie created by Google Analytics: ' + item);
-              if (hostname == 'localhost') {
-                j1.removeCookie({ name: item, domain: false, secure: false });
-              } else {
-                j1.removeCookie({ name: item, domain: '.' + hostname, secure: false });
-              }
+              j1.removeCookie({ name: item });
             });
 
             gaExists  = document.getElementById('google-tag-manager') === null ? false : true;
@@ -200,7 +208,7 @@ var logText;
               document.head.appendChild(gaScript);
             }
 
-            user_consent  = j1.readCookie(cookie_names.user_consent);
+            user_consent = j1.readCookie(cookie_names.user_consent);
             if (user_consent.analysis && !skipHost ) {
               if (validProviderID) {
                 logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
@@ -216,9 +224,14 @@ var logText;
               GTagOptIn.register(providerID);
               GTagOptIn.optOut();
             }
+
             _this.setState('finished');
             logger.debug('\n' + 'state: ' + _this.getState());
             logger.info('\n' + 'module initializing: finished');
+
+            endTimeModule = Date.now();
+            logger.info('\n' + 'module initializing time: ' + (endTimeModule-startTimeModule) + 'ms');
+
             clearInterval(dependencies_met_page_ready);
             {% when "custom" %}
             // [INFO   ] [j1.adapter.analytics                    ] [ place provider: Custom Provider ]
@@ -227,6 +240,7 @@ var logText;
           {% else %}
             logger = log4javascript.getLogger('j1.adapter.analytics');
             logger.info('\n' + 'Google Analytics: disabled');
+
             clearInterval(dependencies_met_page_ready);
           {% endif %}
         }
@@ -239,7 +253,7 @@ 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;
@@ -249,9 +263,11 @@ var logText;
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
+
         //
         // Place handling of command|action here
         //
+
         logger.info('\n' + message.text);
       }
 
@@ -266,7 +282,7 @@ var logText;
     // setState()
     // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function (stat) {
+    setState: (stat) => {
       _this.state = stat;
     }, // END setState
 
@@ -274,7 +290,7 @@ var logText;
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
-    getState: function () {
+    getState: () => {
       return _this.state;
     } // END getState
 

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

@@ -60,33 +60,41 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-j1.adapter.asciidoctor = (function (j1, window) {
+j1.adapter.asciidoctor = ((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.rtable',
@@ -94,30 +102,32 @@ j1.adapter.asciidoctor = (function (j1, window) {
       }, options);
 
       // -----------------------------------------------------------------------
-      // Global variable settings
+      // global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.asciidoctor;
       logger  = log4javascript.getLogger('j1.adapter.asciidoctor');
 
-      // initialize state flag
-      _this.setState('started');
-      logger.debug('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
       // -----------------------------------------------------------------------
-      // asciidoctor initializer
+      // module initializer
       // -----------------------------------------------------------------------
-      var log_text = '\n' + 'asciidoctor is being initialized';
-      logger.info(log_text);
+      var dependencies_met_j1_finished = setInterval(() => {
+        var j1CoreFinished = (j1.getState() === 'finished') ? true : false;
 
+        if (j1CoreFinished) {
+          startTimeModule = Date.now();
 
-      var dependencies_met_j1_finished = setInterval(function() {
-        if (j1.getState() == 'finished') {
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
 
         	j1.core.asciidoctor.init();
 
           _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 dependencies_met_j1_finished
@@ -129,7 +139,7 @@ j1.adapter.asciidoctor = (function (j1, window) {
     // messageHandler: MessageHandler for J1 CookieConsent module
     // 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;
@@ -139,9 +149,11 @@ j1.adapter.asciidoctor = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
+
         //
         // Place handling of command|action here
         //
+
         logger.info('\n' + message.text);
       }
 
@@ -156,7 +168,7 @@ j1.adapter.asciidoctor = (function (j1, window) {
     // setState()
     // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function (stat) {
+    setState: (stat) => {
       _this.state = stat;
     }, // END setState
 
@@ -164,7 +176,7 @@ j1.adapter.asciidoctor = (function (j1, window) {
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
-    getState: function () {
+    getState: () => {
       return _this.state;
     } // END getState