j1-template 2023.0.13 → 2023.0.15

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

@@ -83,9 +83,10 @@ j1.adapter.rangeSlider = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var moduleOptions = {};
   var instances     = [];
-  var frontmatterOptions;
+  var rangeSliderDefaults;
+  var rangeSliderSettings;
+  var rangeSliderOptions;
   var elms;
   var _this;
   var logger;
@@ -131,13 +132,10 @@ j1.adapter.rangeSlider = (function (j1, window) {
       _this   = j1.adapter.rangeSlider;
       logger  = log4javascript.getLogger('j1.adapter.rangeSlider');
 
-      // create settings object from frontmatterOptions
-      frontmatterOptions = options != null ? $.extend({}, options) : {};
-      moduleOptions = $.extend({}, {{range_slider_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
-      }
+      // Load  module DEFAULTS|CONFIG
+      rangeSliderDefaults = $.extend({}, {{range_slider_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      rangeSliderSettings = $.extend({}, {{range_slider_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      rangeSliderOptions  = $.extend(true, {}, rangeSliderDefaults, rangeSliderSettings);
 
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
@@ -153,9 +151,9 @@ j1.adapter.rangeSlider = (function (j1, window) {
             if (elms.length) {
               logger.info('\n' + 'number of rangeSlider elements found: ' + elms.length);
 
-              // -------------------------------------------------------------------
+              // ---------------------------------------------------------------
               // slider initializer
-              // -------------------------------------------------------------------
+              // ---------------------------------------------------------------
               var log_text = '\n' + 'rangeSlider elements are being initialized';
               logger.info(log_text);
 
@@ -163,7 +161,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
                 {% assign slider_id = item.slider.id %}
 
                 {% comment %} load default options
-                ---------------------------------------------------------------------- {% endcomment %}
+                ---------------------------------------------------------------- {% endcomment %}
                 {% assign start             = range_slider_options.options.start %}
                 {% assign connect           = range_slider_options.options.connect %}
                 {% assign step              = range_slider_options.options.step %}
@@ -173,7 +171,6 @@ j1.adapter.rangeSlider = (function (j1, window) {
                 {% assign format_decimals   = range_slider_options.options.format.decimals %}
                 {% assign cbOnUpdate        = range_slider_options.options.cbOnUpdate %}
 
-
                 {% comment %} overload defaults by slider options
                 ---------------------------------------------------------------- {% endcomment %}
                 {% if item.slider.options.title %}            {% assign title           = item.slider.options.title %}            {% endif %}
@@ -187,6 +184,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
                 {% if item.slider.options.format.decimals %}  {% assign format_decimals = item.slider.options.format.decimals %}  {% endif %}
                 {% if item.slider.options.cbOnUpdate %}       {% assign cbOnUpdate      = item.slider.options.cbOnUpdate %}       {% endif %}
 
+
                 elms.forEach(function (elm) {
                   var id      = elm.id;
                   var parent  = document.getElementById(id);

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

@@ -44,6 +44,7 @@ regenerate:                             false
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/rouge.js

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

@@ -82,8 +82,9 @@ j1.adapter.rtable = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var moduleOptions = {};
-  var frontmatterOptions;
+  var rtableDefaults;
+  var rtableSettings;
+  var rtableOptions;
   var _this;
   var logger;
   var logText;
@@ -126,19 +127,16 @@ j1.adapter.rtable = (function (j1, window) {
       _this   = j1.adapter.rtable;
       logger  = log4javascript.getLogger('j1.adapter.rtable');
 
+      // Load  module DEFAULTS|CONFIG
+      rtableDefaults = $.extend({}, {{rtable_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      rtableSettings = $.extend({}, {{rtable_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      rtableOptions  = $.extend(true, {}, rtableDefaults, rtableSettings);
+
       // 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({}, {{rtable_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
-      }
-
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
 
@@ -160,7 +158,7 @@ j1.adapter.rtable = (function (j1, window) {
               // add needed CSS class/attribute for tablesaw
               $(curTable).addClass('table');
               $(curTable).addClass('tablesaw');
-              $(curTable).attr('data-tablesaw-mode', moduleOptions.rtable.mode);
+              $(curTable).attr('data-tablesaw-mode', rtableOptions.rtable.mode);
 
               // Advanced mode NOT supported (mode stack only)
               //
@@ -170,12 +168,12 @@ j1.adapter.rtable = (function (j1, window) {
               // $(curTable).attr('data-tablesaw-mode-switch', '');
 
               Tablesaw.init(curTable, {
-                breakpoint:   moduleOptions.rtable.breakpoint
+                breakpoint:   rtableOptions.rtable.breakpoint
               });
 
               // set initial state for all table/colgroup elements
               //
-              breakpoint = bsMediaBreakpoints[moduleOptions.rtable.breakpoint];
+              breakpoint = bsMediaBreakpoints[rtableOptions.rtable.breakpoint];
               if (! breakpoint) {
                 breakpoint = bsMediaBreakpoints['lg'];
               }

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

@@ -38,11 +38,19 @@ regenerate:                             true
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
-{% comment %} Set config data (settings only)
+{% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign scroller_defaults = modules.defaults.scroller.defaults %}
 {% assign scroller_settings = modules.scroller.settings %}
 
+{% comment %} Set config options (correct)
+--------------------------------------------------------------------------------
+{% assign scroller_options  = scroller_defaults | merge: scroller_settings %}
+--------------------------------------------------------------------------------
+{% endcomment %}
+
 {% comment %} Set config options (settings only)
+TODO: Check|Fix the (Liquid) merge issue for scroller_options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign scroller_options  = scroller_settings %}
 
@@ -53,6 +61,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/scroller.js
@@ -83,7 +92,9 @@ j1.adapter.scroller = (function (j1, window) {
 var environment   = '{{environment}}';
 var language      = '{{site.language}}';
 var user_agent    = platform.ua;
-var moduleOptions = {};
+var scrollerDefaults;
+var scrollerSettings;
+var scrollerOptions;
 var _this;
 var logger;
 var logText;
@@ -121,6 +132,11 @@ var lastPageInfo;
       _this = j1.adapter.scroller;
       logger = log4javascript.getLogger('j1.adapter.scroller');
 
+      // 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());

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

@@ -65,6 +65,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/themer.js
@@ -104,7 +105,6 @@ j1.adapter.themer = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment               = '{{environment}}';
-  var themerOptions             = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
   var url                       = new liteURL(window.location.href);
   var secure                    = (url.protocol.includes('https')) ? true : false;
   var user_state                = {};
@@ -113,27 +113,25 @@ j1.adapter.themer = (function (j1, window) {
   var user_state_detected       = false;
   var styleLoaded               = false;
   var id                        = 'default';
-  var user_state_cookie;
-  var theme_css_html;
-  var _this;
-  var logger;
-  var logText;
-  var cookie_written;
-
   var cssExtension              = (environment === 'production') ? '.min.css' : '.css';
-
   var default_theme_name        = '{{default_theme.name}}';
   var default_theme_author      = '{{default_theme.author}}';
   var default_theme_author_url  = '{{default_theme.author_url}}';
   var default_theme_css_name    = default_theme_name.toLowerCase();
   var default_theme_css         = '{{asset_path}}/{{theme_base}}/' + default_theme_css_name + '/bootstrap' + cssExtension;
-
   var interval_count            = 0;
-  var max_count                 = themerOptions.retries;
-
+  var user_state_cookie;
+  var theme_css_html;
+  var _this;
+  var logger;
+  var logText;
+  var cookie_written;
+  var themerDefaults;
+  var themerSettings;
+  var themerOptions;
+  var max_count;
   var j1Cookies;
   var gaCookies;
-
   var url;
   var baseUrl;
   var error_page;
@@ -191,17 +189,25 @@ j1.adapter.themer = (function (j1, window) {
       // Global variable settings
       // -----------------------------------------------------------------------
       _this       = j1.adapter.themer;
+      logger      = log4javascript.getLogger('j1.adapter.themer');
+
+      // Load  module DEFAULTS|CONFIG
+      themerDefaults = $.extend({}, {{themer_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      themerSettings = $.extend({}, {{themer_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      themerOptions  = $.extend(true, {}, themerDefaults, themerSettings);
+
+      max_count   = themerOptions.retries;
       url         = new liteURL(window.location.href);
       baseUrl     = url.origin;
       error_page  = url.origin + '/204.html';
       j1Cookies   = j1.findCookie('j1');
       gaCookies   = j1.findCookie('_ga');
-      logger      = log4javascript.getLogger('j1.adapter.themer');
 
       // initialize state flag
       _this.state = 'started';
       logger.debug('\n' + 'state: ' + _this.getState());
 
+      // hide page (until theme is loaded)
       $('#no_flicker').hide();
 
       // jadams, 2021-07-25: problem seems NOT an timing issue on the iPad
@@ -282,10 +288,8 @@ j1.adapter.themer = (function (j1, window) {
                // continue processing if page is ready
                var dependencies_met_theme_loaded = setInterval (function () {
                  if (j1.getState() == 'finished') {
-//                 $('#no_flicker').hide();
                    theme_css_html = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
                    $('head').append(theme_css_html);
-
                    clearInterval(dependencies_met_theme_loaded);
                  }
                }, 25); // END dependencies_met_theme_loaded
@@ -333,7 +337,10 @@ j1.adapter.themer = (function (j1, window) {
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module initialized successfully');
+
+          // show page (theme is loaded)
           $('#no_flicker').show();
+
           clearInterval(dependencies_met_theme_applied);
         }
 

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

@@ -66,6 +66,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/toccer.js
@@ -97,9 +98,10 @@ j1.adapter.toccer = (function () {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment         = '{{environment}}';
-  var moduleOptions       = {};
-  var toccerOptions       = {};
-  var frontmatterOptions  = {};
+  var toccerDefaults;
+  var toccerSettings;
+  var toccerOptions;
+  var frontmatterOptions;
   var _this;
   var logger;
   var logText;
@@ -132,32 +134,26 @@ j1.adapter.toccer = (function () {
       _this   = j1.adapter.toccer;
       logger  = log4javascript.getLogger('j1.adapter.toccer');
 
+      // create settings object from frontmatter
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
+
+      // Load  module DEFAULTS|CONFIG
+      toccerDefaults       = $.extend({}, {{toccer_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      toccerSettings       = $.extend({}, {{toccer_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      toccerOptions        = $.extend(true, {}, toccerDefaults, toccerSettings, frontmatterOptions);
+
       // initialize state flag
       _this.setState('started');
       logger.debug('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // Options loader
-      // -----------------------------------------------------------------------
-      /* eslint-disable */
-      // create settings object from frontmatterOptions
-      frontmatterOptions  = options != null ? $.extend({}, options) : {};
-      toccerOptions       = $.extend({}, {{toccer_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // overload (individual) settings into 'moduleOptions'
-      if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = $.extend({}, toccerOptions, frontmatterOptions);
-      }
-      /* eslint-enable */
-
       // save config settings into the toccer object for later access
-      _this['moduleOptions'] = moduleOptions;
+      _this['moduleOptions'] = toccerOptions;
 
-      if (j1.stringToBoolean(moduleOptions.toc)) {
+      if (j1.stringToBoolean(toccerOptions.toc)) {
         var dependencies_met_navigator = setInterval(function() {
           if ( j1.getState() == 'finished' ) {
-            _this.initToccerCore(moduleOptions);
+            _this.initToccerCore(toccerOptions);
             _this.setState('finished');
 
             logger.debug('\n' + 'state: ' + _this.getState());

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

@@ -55,6 +55,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/translator.js
@@ -86,8 +87,10 @@ regenerate:                             true
 
 j1.adapter.translator = (function (j1, window) {
   var environment       = '{{environment}}';
-  var moduleOptions     = {};
   var user_translate    = {};
+  var translatorDefaults;
+  var translatorSettings;
+  var translatorOptions;
   var _this;
   var $modal;
   var cookie_names;
@@ -133,6 +136,12 @@ j1.adapter.translator = (function (j1, window) {
       // -----------------------------------------------------------------------
       _this                 = j1.adapter.translator;
       logger                = log4javascript.getLogger('j1.adapter.translator');
+
+      // Load  module DEFAULTS|CONFIG
+      translatorDefaults    = $.extend({},   {{translator_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      translatorSettings    = $.extend({},   {{translator_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      translatorOptions     = $.extend(true, {}, translatorDefaults, translatorSettings);
+
       url                   = new liteURL(window.location.href);
       baseUrl               = url.origin;
       hostname              = url.hostname;
@@ -161,17 +170,6 @@ j1.adapter.translator = (function (j1, window) {
       // initialize state flag
       _this.state = 'pending';
 
-      {% comment %} Load module config from yml data
-      -------------------------------------------------------------------------- {% endcomment %}
-      // Load  module DEFAULTS|CONFIG
-      /* eslint-disable */
-      moduleOptions = $.extend({}, {{translator_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      /* eslint-enable */
-
-      if (typeof settings !== 'undefined') {
-        moduleOptions = $.extend({}, moduleOptions, settings);
-      }
-
       // add GT callback script dynamically in the head section
       // jadams, 2022-04-21: postTranslateElementInit cause error, disabled
       // -----------------------------------------------------------------------
@@ -182,7 +180,6 @@ j1.adapter.translator = (function (j1, window) {
       gtCallbackScript.text += '    layout:       google.translate.TranslateElement.FloatPosition.TOP_LEFT' + '\n';
       gtCallbackScript.text += '  },' + '\n';
       gtCallbackScript.text += '  "google_translate_element");' + '\n';
-//    gtCallbackScript.text += '  j1.adapter.translator.postTranslateElementInit(gtAPI);' + '\n';
       gtCallbackScript.text += '}' + '\n';
       document.head.appendChild(gtCallbackScript);
 
@@ -203,7 +200,9 @@ j1.adapter.translator = (function (j1, window) {
           domainAttribute = '';
         }
 
-        if ( j1.getState() === 'finished' ) {
+        var pageState   = $('#no_flicker').css("display");
+        var pageVisible = (pageState == 'block') ? true: false;
+        if ( j1.getState() === 'finished' && pageVisible ) {
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
@@ -222,13 +221,8 @@ j1.adapter.translator = (function (j1, window) {
             });
           }
 
-          // hide the google translate element if exists
-          if ($('google_translate_element')) {
-            $('google_translate_element').hide();
-          }
-
           // show|hide translate button if enabled
-          if (moduleOptions.hideTranslatorIcon) {
+          if (translatorOptions.hideTranslatorIcon) {
             if (!user_consent.analysis || !user_consent.personalization) {
               // disable google translate button if visible
               if ($('#quickLinksTranslateButton').css('display') === 'block')  {
@@ -266,39 +260,36 @@ j1.adapter.translator = (function (j1, window) {
             });
           }
 
-          if (moduleOptions.dialogLanguage === 'auto') {
-            moduleOptions.dialogLanguage = '{{contentLanguage}}';
+          if (translatorOptions.dialogLanguage === 'auto') {
+            translatorOptions.dialogLanguage = '{{contentLanguage}}';
           }
 
           j1.translator = new Translator({
-            contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
+            contentURL:               translatorOptions.contentURL,                 // dialog content (modals) for all supported languages
             cookieName:               cookie_names.user_translate,              // name of the translator cookie
             cookieStorageDays:        expires,                                  // lifetime of a cookie [0..365], 0: session cookie
             cookieSameSite:           same_site,                                // restrict consent cookie
             cookieDomain:             domainAttribute,                          // set domain (hostname|domain)
             cookieSecure:             secure,                                   // set
-            cookieConsentName:        moduleOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
-            disableLanguageSelector:  moduleOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
-            dialogContainerID:        moduleOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
-            dialogLanguage:           moduleOptions.dialogLanguage,             // language for the dialog (modal)
-            translationLanguage:      moduleOptions.translationLanguage,        // default language for translation
-            translationLanguages:     moduleOptions.google.translationLanguages,// supported languages for translation
-            translationEnabled:       moduleOptions.translationEnabled,         // run translation enabled|disabled
-            translatorName:           moduleOptions.translatorName,             // translator used for translation
-            xhrDataElement:           moduleOptions.xhrDataElement,             // container for all language-specific dialogs (modals)
-            postSelectionCallback:    moduleOptions.google.postSelectionCallback
+            cookieConsentName:        translatorOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
+            disableLanguageSelector:  translatorOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
+            dialogContainerID:        translatorOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
+            dialogLanguage:           translatorOptions.dialogLanguage,             // language for the dialog (modal)
+            translationLanguage:      translatorOptions.translationLanguage,        // default language for translation
+            translationLanguages:     translatorOptions.google.translationLanguages,// supported languages for translation
+            translationEnabled:       translatorOptions.translationEnabled,         // run translation enabled|disabled
+            translatorName:           translatorOptions.translatorName,             // translator used for translation
+            xhrDataElement:           translatorOptions.xhrDataElement,             // container for all language-specific dialogs (modals)
+            postSelectionCallback:    translatorOptions.google.postSelectionCallback
           });
 
           // enable|disable translation (after callback)
           if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
-            if (moduleOptions.translatorName === 'google') {
+            if (translatorOptions.translatorName === 'google') {
               head.appendChild(gtTranslateScript);
-              if ($('google_translate_element')) {
-                $('google_translate_element').hide();
-              }
             }
           } else {
-            if (moduleOptions.translatorName === 'google') {
+            if (translatorOptions.translatorName === 'google') {
               // remove all googtrans cookies that POTENTIALLY exists
               Cookies.remove('googtrans', { domain: domainAttribute });
               Cookies.remove('googtrans', { domain: hostname });
@@ -408,10 +399,10 @@ j1.adapter.translator = (function (j1, window) {
       logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
       // set content language
-      if (moduleOptions.contentLanguage === 'auto') {
+      if (translatorOptions.contentLanguage === 'auto') {
         srcLang = '{{contentLanguage}}';
       } else {
-        srcLang = moduleOptions.contentLanguage;
+        srcLang = translatorOptions.contentLanguage;
       }
 
       // translation language MUST be DIFFERENT from content language

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

@@ -90,6 +90,10 @@ var environment     = '{{environment}}';
 var cookie_names    = j1.getCookieNames();
 var user_state      = j1.readCookie(cookie_names.user_state);
 var viewport_width  = $(window).width();
+var waveDefaults;
+var waveSettings;
+var waveOptions;
+var frontmatterOptions;
 var themes_allowed;
 var theme_enabled;
 var theme;
@@ -124,14 +128,12 @@ var logText;
       // -----------------------------------------------------------------------
 
       // create settings object from frontmatter
-      var frontmatterOptions  = options != null ? $.extend({}, options) : {};
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
 
-      // create settings object from comment options
-      var waveDefaults = $.extend({}, {{wave_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
-      var waveSettings = $.extend({}, {{wave_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // merge all comment options
-      var waveOptions = $.extend({}, waveDefaults, waveSettings, frontmatterOptions);
+      // create settings object from module options
+      waveDefaults = $.extend({}, {{wave_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      waveSettings = $.extend({}, {{wave_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      waveOptions = $.extend(true, {}, waveDefaults, waveSettings, frontmatterOptions);
 
       _this  = j1.adapter.waves;
       theme  = user_state.theme_name;

data/assets/themes/j1/core/css/themes/unolight/bootstrap.css

@@ -9855,11 +9855,9 @@ body {
   scrollbar-width: none;
   -ms-overflow-style: none; }
 
-/* Firefox */
 .hide-scrollbar-moz {
   scrollbar-width: none; }
 
-/* WebKit */
 .hide-scrollbar::-webkit-scrollbar {
   width: 0px; }
 

data/assets/themes/j1/modules/translator/css/translator.css

@@ -24,10 +24,18 @@
 }
 
 /* hide the powered by */
-.goog-logo-link {display: none !important;}
-.goog-te-gadget {height: 28px !important;  overflow: hidden;}
-/* .goog-te-gadget {display: none !important;} */
+.goog-logo-link {
+  display: none !important;
+}
+.goog-te-gadget {
+  height: 28px !important;  overflow: hidden;
+}
 
-/* remove the top frame */
-body{top: 0 !important;}
-.goog-te-banner-frame{display: none !important;}
+/* hide the Google Translator TopBar (top frame) */
+/* See: https://stackoverflow.com/questions/11248673/hiding-google-translate-bar */
+body {
+  top: 0 !important;
+}
+body > .skiptranslate {
+  display: none;
+}

data/assets/themes/j1/modules/translator/css/translator.min.css

@@ -12,4 +12,4 @@
  # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
 */
-#goog-gt-tt,.goog-te-balloon-frame{display:none!important}.goog-text-highlight{background:none!important;box-shadow:none!important}.goog-logo-link{display:none!important}.goog-te-gadget{height:28px!important;overflow:hidden}body{top:0!important}.goog-te-banner-frame{display:none!important}
+#goog-gt-tt,.goog-te-balloon-frame{display:none !important}.goog-text-highlight{background:none !important;box-shadow:none !important}.goog-logo-link{display:none !important}.goog-te-gadget{height:28px !important;overflow:hidden}body{top:0 !important}body>.skiptranslate{display:none}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2023.0.13'
+  VERSION = '2023.0.15'
 end

data/lib/starter_web/Gemfile

@@ -79,7 +79,7 @@ gem 'j1-template', '~> 2023.0.0'
 
 # Loaded from gem.fury.io
 #source 'https://gem.fury.io/jekyll-one-org/' do
-#  gem 'j1-template', '~> 2023.0.13'
+#  gem 'j1-template', '~> 2023.0.15'
 #end
 
 # ------------------------------------------------------------------------------

data/lib/starter_web/README.md

@@ -380,7 +380,7 @@ This command creates a **initial** project in folder **my-starter**.
   2022-07-30 18:12:12 - GENERATE: Resolving dependencies...
   2022-07-30 18:12:12 - GENERATE: Using bundler 2.3.7
   ...
-  2022-07-30 18:12:12 - GENERATE: Using j1-template 2023.0.13
+  2022-07-30 18:12:12 - GENERATE: Using j1-template 2023.0.15
   2022-07-30 18:12:12 - GENERATE: Bundle complete! 31 Gemfile dependencies, 78 gems now installed.
   2022-07-30 18:12:12 - GENERATE: Bundled gems are installed into `../../.gem`
   2022-07-30 18:12:12 - GENERATE:  C:/Users/xxx/.gem/ruby/3.1.0;C:/DevTools/Ruby31-x64/lib/ruby/gems/3.1.0;
@@ -416,7 +416,7 @@ commands are available as well.
   2022-07-30 18:17:48 - SETUP: Initialize the project ...
   2022-07-30 18:17:48 - SETUP: Be patient, this will take a while ...
   2022-07-30 18:17:49 - SETUP:
-  2022-07-30 18:17:49 - SETUP: > j1@2023.0.13 setup C:\Users\xxx\j1-projects\my-starter
+  2022-07-30 18:17:49 - SETUP: > j1@2023.0.15 setup C:\Users\xxx\j1-projects\my-starter
   2022-07-30 18:17:49 - SETUP: > npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*
   2022-07-30 18:17:49 - SETUP:
   2022-07-30 18:17:50 - SETUP: Setup project for first use ..
@@ -461,7 +461,7 @@ browser. Let's start the journey ...
   Check setup state of the J1 project ...
   2022-07-30 18:26:18 - SITE: Starting up your site ...
   2022-07-30 18:26:18 - SITE:
-  2022-07-30 18:26:18 - SITE: > j1@2023.0.13 j1-site C:\Users\jadams\j1-projects\my-starter
+  2022-07-30 18:26:18 - SITE: > j1@2023.0.15 j1-site C:\Users\jadams\j1-projects\my-starter
   2022-07-30 18:26:18 - SITE: > run-p -s j1-site:*
   2022-07-30 18:26:18 - SITE:
   2022-07-30 18:26:20 - SITE: Startup UTILSRV ..
@@ -500,7 +500,7 @@ Check setup state of the J1 project ...
 REBUILD: Rebuild the projects website ...
 REBUILD: Be patient, this will take a while ...
 2022-07-30 18:45:09 - REBUILD:
-2022-07-30 18:45:09 - REBUILD: > j1@2023.0.13 rebuild C:\Users\xxx\j1-projects\my-starter
+2022-07-30 18:45:09 - REBUILD: > j1@2023.0.15 rebuild C:\Users\xxx\j1-projects\my-starter
 2022-07-30 18:45:09 - REBUILD: > run-s -s rebuild:* && run-s -s post-rebuild:*
 2022-07-30 18:45:09 - REBUILD:
 2022-07-30 18:45:10 - REBUILD: Rebuild site incremental ..
@@ -548,7 +548,7 @@ using Lerna for all packages:
   2022-07-30 18:29:07 - RESET: Reset the project to factory state ...
   2022-07-30 18:29:07 - RESET: Be patient, this will take a while ...
   2022-07-30 18:29:08 - RESET:
-  2022-07-30 18:29:08 - RESET: > j1@2023.0.13 reset C:\Users\xxx\j1-projects\my-starter
+  2022-07-30 18:29:08 - RESET: > j1@2023.0.15 reset C:\Users\xxx\j1-projects\my-starter
   2022-07-30 18:29:08 - RESET: > run-s -s reset:*
   2022-07-30 18:29:08 - RESET:
   2022-07-30 18:29:08 - RESET: Reset project to factory state ..