j1-template 2022.4.7 → 2022.4.10

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

@@ -47,6 +47,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign nbinteract_options  = nbinteract_defaults | merge: nbinteract_settings %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -1374,18 +1376,18 @@ j1.adapter.nbinteract = (function (j1, window) {
         // ---------------------------------------------------------------------
         // on 'show'
         // ---------------------------------------------------------------------
-        _this.$modal.on('show.bs.modal', function () {
-          // hide the menubar for the modal header
-          $('#navigator_nav_navbar').hide();
-        }); // END modal on 'show'
+        // _this.$modal.on('show.bs.modal', function () {
+        //   // hide the menubar for the modal header
+        //   $('#navigator_nav_navbar').hide();
+        // }); // END modal on 'show'
 
         // ---------------------------------------------------------------------
         // on 'hidden'
         // ---------------------------------------------------------------------
-        _this.$modal.on('hidden.bs.modal', function () {
-          // if the modal is closed, show the menubar
-          $('#navigator_nav_navbar').show();
-        }); // END modal on 'hidden'
+        // _this.$modal.on('hidden.bs.modal', function () {
+        //   // if the modal is closed, show the menubar
+        //   $('#navigator_nav_navbar').show();
+        // }); // END modal on 'hidden'
 
       }.bind(_this));
     },  // END loadDialog

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

@@ -48,6 +48,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign range_slider_options  = range_slider_defaults | merge: range_slider_settings %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -134,7 +136,7 @@ j1.adapter.rangeSlider = (function (j1, window) {
       moduleOptions = $.extend({}, {{range_slider_options | replace: 'nil', 'null' | replace: '=>', ':' }});
 
       if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = j1.mergeData(moduleOptions, frontmatterOptions);
+        moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
       }
 
       var dependencies_met_j1_finished = setInterval(function() {

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

@@ -37,6 +37,13 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign template_config   = site.data.j1_config %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/rouge.js

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

@@ -47,6 +47,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign rtable_options  = rtable_defaults | merge: rtable_settings %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -124,7 +126,7 @@ j1.adapter.rtable = (function (j1, window) {
       moduleOptions = $.extend({}, {{rtable_options | replace: 'nil', 'null' | replace: '=>', ':' }});
 
       if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = j1.mergeData(moduleOptions, frontmatterOptions);
+        moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
       }
 
       var dependencies_met_j1_finished = setInterval(function() {

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

@@ -53,7 +53,8 @@ regenerate:                             true
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}

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

@@ -46,6 +46,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign scroller_options  = scroller_settings %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}

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

@@ -58,6 +58,8 @@ regenerate:                             true
   {% assign theme_ext       = "min.css" %}
 {% endif %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -197,8 +199,8 @@ j1.adapter.themer = (function (j1, window) {
         // of the user state cookie
         interval_count += 1;
         if (user_state_detected) {
-           user_state        = j1.readCookie(cookie_names.user_state);
-           user_consent      = j1.readCookie(cookie_names.user_consent);
+           user_state   = j1.readCookie(cookie_names.user_state);
+           user_consent = j1.readCookie(cookie_names.user_consent);
 
            logger.info('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
 
@@ -220,38 +222,16 @@ j1.adapter.themer = (function (j1, window) {
              }
            }
 
-           styleLoaded     = styleSheetLoaded(user_state.theme_css);
-           theme_css_html  = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
-
            // check cookie consistency
-           if (Object.keys(user_state).length > 2)  {
-             // loading theme CSS file except on UNO
-             if (!user_state.theme_name.includes('Uno') || !styleLoaded) {
-               $('head').append(theme_css_html);
-             }
-           } else {
-             logger.fatal('\n' + 'inconsistent state detected for cookie: ' + cookie_names.user_state);
-           }
+           // if (Object.keys(user_state).length > 2)  {
+           //   logger.debug('\n' + 'consistent state detected for cookie: ' + cookie_names.user_state);
+           // } else {
+           //   logger.fatal('\n' + 'inconsistent state detected for cookie: ' + cookie_names.user_state);
+           // }
 
            // set the theme switcher state
            user_state.theme_switcher = themerOptions.enabled;
 
-           // jadams, 2021-08-10: moved hide|show themes menu to
-           // j1 adapter (displayPage)
-           //
-           // jadams, 2021-07-25: hide|show themes menu on cookie consent
-           // (analysis|personalization) settings. BootSwatch is a 3rd party
-           // is using e.g GA. Because NO control is possible on 3rd parties,
-           // for GDPR compliance, themes feature may disabled on
-           // privacy settings
-           //
-           // if (!user_consent.analysis || !user_consent.personalization)  {
-           //   logger.warn('\n' + 'disable themes feature because of privacy settings');
-           //   $("#themes_menu").hide();
-           // } else {
-           //   $("#themes_menu").show();
-           // }
-
            if (themerOptions.enabled) {
            // enable BS ThemeSwitcher
            logger.info('\n' + 'themes detected as: enabled');
@@ -280,11 +260,23 @@ j1.adapter.themer = (function (j1, window) {
            };
            /* eslint-enable */
 
-           logger.info('\n' + 'theme loaded: ' + user_state.theme_name);
-           logger.info('\n' + 'theme css file: ' + user_state.theme_css);
-           _this.setState('finished');
-           logger.debug('\n' + 'state: ' + _this.getState());
-           logger.info('\n' + 'module initialized successfully');
+           // continue processing if page is ready
+           var dependencies_met_theme_applied = setInterval (function () {
+             if (j1.getState() == 'finished') {
+               styleLoaded    = styleSheetLoaded(user_state.theme_css);
+               theme_css_html = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
+
+               // loading theme CSS file except on UNO
+               if (!user_state.theme_name.includes('Uno') || !styleLoaded) {
+                 $('head').append(theme_css_html);
+                 _this.setState('finished');
+                 logger.debug('\n' + 'state: ' + _this.getState());
+                 logger.info('\n' + 'module initialized successfully');
+                 clearInterval(dependencies_met_theme_applied);
+               }
+             }
+           }, 25); // END dependencies_met_theme_applied
+
          } else {
            _this.setState('finished');
            logger.debug('\n' + 'state: ' + _this.getState());

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

@@ -59,6 +59,8 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -94,7 +96,7 @@ j1.adapter.toccer = (function () {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment         = '{{environment}}';                                  // Set environment
+  var environment         = '{{environment}}';
   var moduleOptions       = {};
   var toccerOptions       = {};
   var frontmatterOptions  = {};
@@ -135,41 +137,27 @@ j1.adapter.toccer = (function () {
       logger.debug('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // create settings object from frontmatterOptions
-      var frontmatterOptions = options != null ? $.extend({}, options) : {};
-
       // -----------------------------------------------------------------------
-      // options loader
+      // Options loader
       // -----------------------------------------------------------------------
       /* eslint-disable */
-      toccerOptions = $.extend({}, {{toccer_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // Load (individual) frontmatter options (currently NOT used)
-      if (options != null) { frontmatterOptions = $.extend({}, options); }
+      // 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 = j1.mergeData(frontmatterOptions, toccerOptions);
+        moduleOptions = $.extend({}, toccerOptions, frontmatterOptions);
       }
       /* eslint-enable */
 
-      // save config settings into the toccer object for global access
+      // save config settings into the toccer object for later access
       _this['moduleOptions'] = moduleOptions;
 
-      // cast text-based booleans
-      var isToc = (moduleOptions.toc === 'true');
-      var isComments = (moduleOptions.comments === 'true');
-
-      if ( typeof moduleOptions.collapseDepth === 'undefined') {
-        moduleOptions.collapseDepth = 3;
-      }
-
-      if (isToc) {
+      if (j1.stringToBoolean(moduleOptions.toc)) {
         var dependencies_met_navigator = setInterval(function() {
-//        if ( j1.adapter.navigator.getState() == 'finished' ) {
           if ( j1.getState() == 'finished' ) {
-            var settings = j1.adapter.toccer.moduleOptions;
-
-            _this.initToccerCore(settings);
+            _this.initToccerCore(moduleOptions);
             _this.setState('finished');
 
             logger.debug('\n' + 'state: ' + _this.getState());
@@ -182,17 +170,11 @@ j1.adapter.toccer = (function () {
     }, // END init
 
     // -------------------------------------------------------------------------
-    // Set Toccer options
+    // Initialize the toccer on page
     // -------------------------------------------------------------------------
     initToccerCore: function (options) {
       var scrollOffset = j1.getScrollOffset();
 
-      if (options  !== undefined) {
-        var settings = $.extend({}, options);
-      } else {
-        var settings = false;
-      }
-
       _this.setState('running');
       logger.debug('\n' + 'state: ' + _this.getState());
 
@@ -202,14 +184,14 @@ j1.adapter.toccer = (function () {
         if ($('#toc_mmenu').length) {
           /* eslint-disable */
           tocbot.init({
-            log:                    moduleOptions.log,
-            activeLinkColor:        moduleOptions.activeLinkColor,
-            tocSelector:            moduleOptions.tocSelector,
-            headingSelector:        moduleOptions.headingSelector,
-            ignoreSelector:         moduleOptions.ignoreSelector,
-            contentSelector:        moduleOptions.contentSelector,
-            collapseDepth:          moduleOptions.collapseDepth,
-            throttleTimeout:        moduleOptions.throttleTimeout,
+            log:                    options.log,
+            activeLinkColor:        options.activeLinkColor,
+            tocSelector:            options.tocSelector,
+            headingSelector:        options.headingSelector,
+            ignoreSelector:         options.ignoreSelector,
+            contentSelector:        options.contentSelector,
+            collapseDepth:          options.collapseDepth,
+            throttleTimeout:        options.throttleTimeout,
             hasInnerContainers:     false,
             includeHtml:            false,
             linkClass:              'toc-link',
@@ -224,11 +206,11 @@ j1.adapter.toccer = (function () {
             positionFixedClass:     'is-position-fixed',
             fixedSidebarOffset:     'auto',
             scrollContainer:        null,
-            scrollSmooth:           moduleOptions.scrollSmooth,
-            scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
+            scrollSmooth:           options.scrollSmooth,
+            scrollSmoothDuration:   options.scrollSmoothDuration,
             scrollSmoothOffset:     scrollOffset,
             headingsOffset:         1,
-            throttleTimeout:        moduleOptions.throttleTimeout
+            throttleTimeout:        options.throttleTimeout
           });
           /* eslint-enable */
           logger.debug('\n' + 'met dependencies for: loadHTML');
@@ -236,42 +218,6 @@ j1.adapter.toccer = (function () {
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished
 
-      // jadams, 2021-11-19: is this really neded?
-      //
-      // $(window).on('resize', function() {
-      //   var scrollOffset = j1.getScrollOffset();
-      //
-      //   tocbot.refresh({
-      //     log:                    moduleOptions.log,
-      //     activeLinkColor:        moduleOptions.activeLinkColor,
-      //     tocSelector:            moduleOptions.tocSelector,
-      //     headingSelector:        moduleOptions.headingSelector,
-      //     ignoreSelector:         moduleOptions.ignoreSelector,
-      //     contentSelector:        moduleOptions.contentSelector,
-      //     collapseDepth:          moduleOptions.collapseDepth,
-      //     throttleTimeout:        moduleOptions.throttleTimeout,
-      //     hasInnerContainers:     false,
-      //     includeHtml:            false,
-      //     linkClass:              'toc-link',
-      //     extraLinkClasses:       '',
-      //     activeLinkClass:        'is-active-link',
-      //     listClass:              'toc-list',
-      //     extraListClasses:       '',
-      //     isCollapsedClass:       'is-collapsed',
-      //     collapsibleClass:       'is-collapsible',
-      //     listItemClass:          'toc-list-item',
-      //     positionFixedSelector:  '',
-      //     positionFixedClass:     'is-position-fixed',
-      //     fixedSidebarOffset:     'auto',
-      //     scrollContainer:        null,
-      //     scrollSmooth:           moduleOptions.scrollSmooth,
-      //     scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
-      //     scrollSmoothOffset:     scrollOffset,
-      //     headingsOffset:         1,
-      //     throttleTimeout:        moduleOptions.throttleTimeout
-      //   });
-      // });
-
     }, // END initToccerCore
 
     // -------------------------------------------------------------------------

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

@@ -48,6 +48,8 @@ regenerate:                             true
 {% comment %} Set variables
 -------------------------------------------------------------------------------- {% endcomment %}
 
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -167,7 +169,7 @@ j1.adapter.translator = (function (j1, window) {
       /* eslint-enable */
 
       if (typeof settings !== 'undefined') {
-        moduleOptions = j1.mergeData(moduleOptions, settings);
+        moduleOptions = $.extend({}, moduleOptions, settings);
       }
 
       // add GT callback script dynamically in the head section