j1-template 2023.0.13 → 2023.0.14

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

@@ -85,7 +85,9 @@ j1.adapter.framer = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var framerDefaults;
+  var framerSettings;
+  var framerOptions;
   var _this;
   var logger;
   var logText;
@@ -121,42 +123,36 @@ j1.adapter.framer = (function (j1, window) {
           _this   = j1.adapter.framer;
           logger  = log4javascript.getLogger('j1.adapter.framer');
 
+          // Load  module DEFAULTS|CONFIG
+          framerDefaults = $.extend({}, {{framer_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+          framerSettings = $.extend({}, {{framer_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+          framerOptions  = $.extend(true, {}, framerDefaults, framerSettings);
+
           // initialize state flag
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          {% comment %} Load module config from yml data
-          -------------------------------------------------------------------------- {% endcomment %}
-          // Load  module DEFAULTS|CONFIG
-          /* eslint-disable */
-          moduleOptions = $.extend({}, {{framer_options | replace: '=>', ':' | replace: 'nil', '""'}});
-          /* eslint-enable */
-
-          if (typeof settings !== 'undefined') {
-            moduleOptions = $.extend({}, moduleOptions, settings);
-          }
-
           iFrameResize({
-            log:                      moduleOptions.log,
-            autoResize:               moduleOptions.autoResize,
-            bodyBackground:           moduleOptions.bodyBackground,
-            bodyMargin:               moduleOptions.bodyMargin,
-            checkOrigin:              moduleOptions.checkOrigin,
-            inPageLinks:              moduleOptions.inPageLinks,
-            interval:                 moduleOptions.interval,
-            heightCalculationMethod:  moduleOptions.heightCalculationMethod,
-            maxHeight:                moduleOptions.maxHeight,
-            minWidth:                 moduleOptions.minWidth,
-            maxWidth:                 moduleOptions.maxWidth,
-            minHeight:                moduleOptions.minHeight,
-            resizeFrom:               moduleOptions.resizeFrom,
-            scrolling:                moduleOptions.scrolling,
-            sizeHeight:               moduleOptions.sizeHeight,
-            sizeWidth:                moduleOptions.sizeWidth,
-            tolerance:                moduleOptions.tolerance,
-            widthCalculationMethod:   moduleOptions.widthCalculationMethod,
-            targetOrigin:             moduleOptions.checkOrigin
+            log:                      framerOptions.log,
+            autoResize:               framerOptions.autoResize,
+            bodyBackground:           framerOptions.bodyBackground,
+            bodyMargin:               framerOptions.bodyMargin,
+            checkOrigin:              framerOptions.checkOrigin,
+            inPageLinks:              framerOptions.inPageLinks,
+            interval:                 framerOptions.interval,
+            heightCalculationMethod:  framerOptions.heightCalculationMethod,
+            maxHeight:                framerOptions.maxHeight,
+            minWidth:                 framerOptions.minWidth,
+            maxWidth:                 framerOptions.maxWidth,
+            minHeight:                framerOptions.minHeight,
+            resizeFrom:               framerOptions.resizeFrom,
+            scrolling:                framerOptions.scrolling,
+            sizeHeight:               framerOptions.sizeHeight,
+            sizeWidth:                framerOptions.sizeWidth,
+            tolerance:                framerOptions.tolerance,
+            widthCalculationMethod:   framerOptions.widthCalculationMethod,
+            targetOrigin:             framerOptions.checkOrigin
           });
 
           _this.setState('finished');

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

@@ -1240,6 +1240,8 @@ var j1 = (function (options) {
           var pageState   = $('#no_flicker').css("display");
           var pageVisible = (pageState == 'block') ? true: false;
           if ( j1.getState() === 'finished' && pageVisible ) {
+            // TODO: Hide GoogleTranslator
+            // $('.skiptranslate').hide();
             setTimeout (function() {
               // scroll to an anchor in current page if given in URL
               j1.scrollToAnchor();

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

@@ -84,7 +84,10 @@ j1.adapter.justifiedGallery = (function (j1, window) {
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var justifiedGalleryDefaults;
+  var justifiedGallerySettings;
+  var justifiedGalleryOptions;
+  var frontmatterOptions;
   var _this;
   var logger;
   var logText;
@@ -114,6 +117,15 @@ j1.adapter.justifiedGallery = (function (j1, window) {
       // -----------------------------------------------------------------------
       // Global variable settings
       // -----------------------------------------------------------------------
+
+      // create settings object from frontmatter (page settings)
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
+
+      // Load  module DEFAULTS|CONFIG
+      justifiedGalleryDefaults = $.extend({}, {{jf_gallery_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      justifiedGallerySettings = $.extend({}, {{jf_gallery_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      justifiedGalleryOptions  = $.extend(true, {}, justifiedGalleryDefaults, justifiedGallerySettings, frontmatterOptions);
+
       _this = j1.adapter.justifiedGallery;
       logger = log4javascript.getLogger('j1.adapter.justifiedGallery');
 
@@ -124,21 +136,9 @@ j1.adapter.justifiedGallery = (function (j1, window) {
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          {% comment %} Load module config from yml data
-          ---------------------------------------------------------------------- {% endcomment %}
-          // Load  module DEFAULTS|CONFIG
-          //
-          /* eslint-disable */
-          moduleOptions = $.extend({}, {{jf_gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
-          /* eslint-enable */
-
-          if (typeof settings !== 'undefined') {
-            moduleOptions = $.extend({}, moduleOptions, settings);
-          }
-
-          _this.initialize(moduleOptions);
-
+          _this.initialize(justifiedGalleryOptions);
           _this.setState('finished');
+
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module initialized successfully');
 

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

@@ -86,8 +86,11 @@ j1.adapter.lightbox = (function (j1, window) {
 
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}';
-  var moduleOptions = {};
+  var environment  = '{{environment}}';
+  var lightboxDefaults;
+  var lightboxSettings;
+  var lightboxOptions;
+  var frontmatterOptions;  
   var _this;
   var logger;
   var logText;
@@ -120,6 +123,14 @@ j1.adapter.lightbox = (function (j1, window) {
       _this   = j1.adapter.lightbox;
       logger  = log4javascript.getLogger('j1.adapter.lightbox');
 
+      // create settings object from frontmatter (page settings)
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
+
+      // Load  module DEFAULTS|CONFIG
+      lightboxDefaults          = $.extend({}, {{lightbox_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      lightboxSettings          = $.extend({}, {{lightbox_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      lightboxOptions           = $.extend(true, {}, lightboxDefaults, lightboxSettings, frontmatterOptions);
+
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
 
@@ -127,22 +138,20 @@ j1.adapter.lightbox = (function (j1, window) {
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          /* eslint-disable */
           lightbox.option({
-            alwaysShowNavOnTouchDevices:  {{ lightbox_options.alwaysShowNavOnTouchDevices | json }},
-            albumLabel:                   {{ lightbox_options.albumLabel | json }},
-            disableScrolling:             {{ lightbox_options.disableScrolling | json }},
-            fadeDuration:                 {{ lightbox_options.fadeDuration | json }},
-            fitImagesInViewport:          {{ lightbox_options.fitImagesInViewport | json }},
-            imageFadeDuration:            {{ lightbox_options.imageFadeDuration | json }},
-            maxWidth:                     {{ lightbox_options.maxWidth | json }},
-            maxHeight:                    {{ lightbox_options.maxHeight | json }},
-            positionFromTop:              {{ lightbox_options.positionFromTop | json }},
-            resizeDuration:               {{ lightbox_options.resizeDuration | json }},
-            showImageNumberLabel:         {{ lightbox_options.showImageNumberLabel | json }},
-            wrapAround:                   {{ lightbox_options.wrapAround | json }}
+            alwaysShowNavOnTouchDevices:  lightboxOptions.alwaysShowNavOnTouchDevices,
+            albumLabel:                   lightboxOptions.albumLabel,
+            disableScrolling:             lightboxOptions.disableScrolling,
+            fadeDuration:                 lightboxOptions.fadeDuration,
+            fitImagesInViewport:          lightboxOptions.fitImagesInViewport,
+            imageFadeDuration:            lightboxOptions.imageFadeDuration,
+            maxWidth:                     lightboxOptions.maxWidth,
+            maxHeight:                    lightboxOptions.maxHeight,
+            positionFromTop:              lightboxOptions.positionFromTop,
+            resizeDuration:               lightboxOptions.resizeDuration,
+            showImageNumberLabel:         lightboxOptions.showImageNumberLabel,
+            wrapAround:                   lightboxOptions.wrapAround
           });
-          /* eslint-enable */
 
           _this.setState('finished');
           logger.debug('\n' + 'state: ' + _this.getState());

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

@@ -91,9 +91,11 @@ j1.adapter.logger = (function (j1, window) {
   var page_id               = j1.generateId(11);
   var cookie_names          = j1.getCookieNames();
   var loggerRequestCallback = false;
-  var loggerOptions         = {};
   var utilServerOptions     = {};
   var ajaxAppenderOptions   = {};
+  var loggerDefaults;
+  var loggerSettings;
+  var loggerOptions;
   var user_session;
   var appDetected;
   var _this;
@@ -185,18 +187,22 @@ j1.adapter.logger = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      /* eslint-disable */
-      loggerOptions       = $.extend({}, {{logger_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      utilServerOptions   = $.extend({}, {{util_server_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      /* eslint-enable */
-      ajaxAppenderOptions = loggerOptions.appenders[1].appender;
-
       // -----------------------------------------------------------------------
       // Global variable settings
       // -----------------------------------------------------------------------
       _this       = j1.adapter.logger;
       logger      = log4javascript.getLogger('j1.adapter.logger');
 
+      // Load  module DEFAULTS|CONFIG
+      loggerDefaults      = $.extend({},   {{logger_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      loggerSettings      = $.extend({},   {{logger_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      loggerOptions       = $.extend(true, {}, loggerDefaults, loggerSettings);
+      ajaxAppenderOptions = loggerOptions.appenders[1].appender;
+
+      /* eslint-disable */
+      utilServerOptions   = $.extend({}, {{util_server_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
+
       // wait until user_session.mode is detected by j1.init()
       //
       var dependencies_met_mode_detected = setInterval(function() {

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

@@ -41,10 +41,6 @@ regenerate:                             true
 {% assign lunr_search_defaults  = modules.defaults.lunr.defaults %}
 {% assign lunr_search_settings  = modules.lunr.settings %}
 
-{% comment %} Set config options
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign lunr_search_options   = lunr_search_defaults | merge: lunr_search_settings %}
-
 {% comment %} Detect prod mode
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
@@ -52,6 +48,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/lunr.js
@@ -79,8 +76,10 @@ j1.adapter.lunr = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}';
-  var searchOptions = {};
+  var environment = '{{environment}}';
+  var searchDefaults;
+  var searchSettings;
+  var searchOptions;
   var _this;
   var logger;
   var logText;
@@ -114,11 +113,10 @@ j1.adapter.lunr = (function (j1, window) {
       _this   = j1.adapter.lunr;
       logger  = log4javascript.getLogger('j1.adapter.lunr');
 
-      // -----------------------------------------------------------------------
-      // options loader
-      // -----------------------------------------------------------------------
-      /* eslint-disable */
-      searchOptions = $.extend({}, {{lunr_search_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      // Load  module DEFAULTS|CONFIG
+      searchDefaults = $.extend({},   {{lunr_search_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      searchSettings = $.extend({},   {{lunr_search_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      searchOptions  = $.extend(true, {}, searchDefaults, searchSettings);
 
       // -----------------------------------------------------------------------
       // lunr initializer

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

@@ -59,6 +59,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/masonry.js
@@ -90,6 +91,9 @@ var environment     = '{{environment}}';
 var cookie_names    = j1.getCookieNames();
 var user_state      = j1.readCookie(cookie_names.user_state);
 var viewport_width  = $(window).width();
+var masonryDefaults;
+var masonrySettings;
+var masonryOptions;
 var themes_allowed;
 var theme_enabled;
 var theme;
@@ -122,21 +126,15 @@ var logText;
       // -----------------------------------------------------------------------
       // Global variable settings
       // -----------------------------------------------------------------------
-
-      // create settings object from frontmatter
-      var frontmatterOptions  = options != null ? $.extend({}, options) : {};
-
-      // create settings object from comment options
-      var masonryDefaults = $.extend({}, {{masonry_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
-      var masonrySettings = $.extend({}, {{masonry_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // merge all comment options
-      var masonryOptions = $.extend({}, masonryDefaults, masonrySettings, frontmatterOptions);
-
       _this  = j1.adapter.masonry;
       theme  = user_state.theme_name;
       logger = log4javascript.getLogger('j1.adapter.masonry');
 
+      // Load  module DEFAULTS|CONFIG
+      masonryDefaults = $.extend({}, {{masonry_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      masonrySettings = $.extend({}, {{masonry_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      masonryOptions = $.extend({}, masonryDefaults, masonrySettings);
+  
       // -----------------------------------------------------------------------
       // initializer
       // -----------------------------------------------------------------------

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

@@ -26,23 +26,22 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment         = site.environment %}
-{% assign template_config     = site.data.j1_config %}
-{% assign modules             = site.data.modules %}
+{% assign environment                = site.environment %}
+{% assign template_config            = site.data.j1_config %}
+{% assign modules                    = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign slider_defaults     = modules.defaults.masterslider.defaults %}
-{% assign slider_settings     = modules.masterslider.settings %}
+{% assign master_slider_defaults     = modules.defaults.masterslider.defaults %}
+{% assign master_slider_settings     = modules.masterslider.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign slider_options      = slider_defaults | merge: slider_settings %}
-{% assign lightbox_enabled    = slider_options.enable_lightbox %}
-{% assign slider_manager      = slider_options.slider_manager %}
-{% assign save_slider_config  = slider_options.save_slider_config %}
-{% assign module_version      = slider_options.module_version %}
-{% assign sliders             = slider_settings.sliders %}
+{% assign master_slider_options      = master_slider_defaults | merge: master_slider_settings %}
+{% assign lightbox_enabled           = master_slider_options.enable_lightbox %}
+{% assign slider_manager             = master_slider_options.slider_manager %}
+{% assign save_slider_config         = master_slider_options.save_slider_config %}
+{% assign module_version             = master_slider_options.module_version %}
 
 {% comment %} Detect prod mode
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -51,6 +50,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/masterslider.js
@@ -83,9 +83,11 @@ j1.adapter.masterslider = (function (j1, window) {
   var sliderManager     = j1.stringToBoolean('{{slider_manager}}');
   var lightboxEnabled   = j1.stringToBoolean('{{lightbox_enabled}}');
   var saveSliderConfig  = j1.stringToBoolean('{{save_slider_config}}');
-  var sliderOptions     = {};
-  var sliders           = {};
   var newline           = '\n';
+
+  var masterSliderDefaults;
+  var masterSliderSettings;
+  var masterSliderOptions;
   var _this;
   var logger;
   var logText;
@@ -123,9 +125,10 @@ j1.adapter.masterslider = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // collect slider data
-      sliderOptions = $.extend({}, {{slider_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-      sliders       = $.extend({}, {{slider_options.sliders | replace: 'nil', 'null' | replace: '=>', ':' }});
+      // Load  module DEFAULTS|CONFIG
+      masterSliderDefaults = $.extend({}, {{master_slider_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      masterSliderSettings = $.extend({}, {{master_slider_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      masterSliderOptions = $.extend({}, masterSliderDefaults, masterSliderSettings);
 
       // -----------------------------------------------------------------------
       // Global variable settings
@@ -139,10 +142,10 @@ j1.adapter.masterslider = (function (j1, window) {
 
       // load HTML portion for sliders configured
       console.debug('loading HTML portion for all sliders configured');
-      _this.loadSliderHTML(sliderOptions, sliders);
+      _this.loadSliderHTML(masterSliderOptions, masterSliderOptions.sliders);
       // create an 'MasterSlider' instance for all sliders configured
       console.debug('create an \'MasterSlider\' instance for all MS sliders configured');
-      _this.createSliderInstances(sliders, msSliderManager);
+      _this.createSliderInstances(masterSliderOptions.sliders, msSliderManager);
 
       // initialize sliders configured if HTML portion (of sliders) loaded
       var dependencies_met_data_loaded = setInterval(function() {
@@ -150,7 +153,7 @@ j1.adapter.masterslider = (function (j1, window) {
           logger.info('\n' + 'ms module version detected: ' + moduleVersion);
           logger.info('\n' + 'module is being initialized');
           console.debug('MS slider module is being initialized');
-          _this.initSliders(sliderOptions, sliders, msSliderManager, saveSliderConfig);
+          _this.initSliders(masterSliderOptions, masterSliderOptions.sliders, msSliderManager, saveSliderConfig);
           clearInterval(dependencies_met_data_loaded);
         } // END dependencies_met_j1_finished
       }, 25);
@@ -167,8 +170,8 @@ j1.adapter.masterslider = (function (j1, window) {
               _this.setState('finished');
               logger.info('\n' + 'initializing module finished');
               console.debug('initializing MS slider module finished');
-              clearInterval(dependencies_met_module_finished);
-            }, sliderOptions.slider_manager_load_timeout);
+            }, masterSliderOptions.slider_manager_load_timeout);
+            clearInterval(dependencies_met_module_finished);
         } // END dependencies_met_j1_finished
       }, 25);
 
@@ -199,7 +202,7 @@ j1.adapter.masterslider = (function (j1, window) {
           j1.loadHTML({
             xhr_container_id: xhr_container_id,
             xhr_data_path:    xhr_data_path,
-            xhr_data_element: sliders[key].id
+            xhr_data_element: slider[key].id
           });
         } else {
           console.debug('slider found disabled on id: ' + slider[key].id);
@@ -272,7 +275,7 @@ j1.adapter.masterslider = (function (j1, window) {
             if (slider[index].controls) {
               Object.keys(slider[index].controls).forEach(function(key) {
                 var msSliderManagerItem = '\n';
-                logger.info('\n' + 'slider control found id|key: ' + slider[index].id + '|' + key);
+                logger.debug('\n' + 'slider control found id|key: ' + slider[index].id + '|' + key);
 
                 // merge settings, defaults into control
                 control = $.extend({}, controlOptions[key], slider[index].controls[key]);
@@ -306,7 +309,7 @@ j1.adapter.masterslider = (function (j1, window) {
         var index;
         var i=0;
 
-        logger.info('\n' + 'generate slider plugins');
+        logger.debug('\n' + 'generate slider plugins');
 
         if (sliderManager) msSliderManager.innerHTML += newline;
         Object.keys(slider).forEach(function(key) {
@@ -379,7 +382,7 @@ j1.adapter.masterslider = (function (j1, window) {
             // log the filter object if enabled
             if (setup.filters != null) {
               var filterSettings = JSON.stringify(setup.filters).replace(/"/g, '');
-              logger.info('\n' + 'filters found: ' + filterSettings.replace(/{/g, '').replace(/}/g, ''));
+              logger.debug('\n' + 'filters found: ' + filterSettings.replace(/{/g, '').replace(/}/g, ''));
             }
 
             if (sliderManager) {

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

@@ -82,8 +82,6 @@ j1.adapter.nbinteract = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment     = '{{environment}}';
-  var moduleOptions   = {};
-  var moduleSettings  = {};
   var message         = {};
   var flags            = {
     checkURL:   false
@@ -144,6 +142,9 @@ j1.adapter.nbinteract = (function (j1, window) {
   var widgetCells;
   var widgetCellsRendered;
   var nbiNotebookReady;
+  var nbinteractDefaults;
+  var nbinteractSettings;
+  var nbinteractOptions;
   var Events;
 
   // ---------------------------------------------------------------------------
@@ -181,20 +182,24 @@ j1.adapter.nbinteract = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      moduleOptions = $.extend({}, {{nbinteract_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
       // -----------------------------------------------------------------------
       // Global variable settings
       // -----------------------------------------------------------------------
       _this                   = j1.adapter.nbinteract;
       logger                  = log4javascript.getLogger('j1.adapter.nbinteract');
-      nbiModalAutoClose       = moduleOptions.nbi_messages_auto_close;
-      nbiModalAutoCloseDelay  = moduleOptions.nbi_messages_auto_close_delay;
-      nbiInitTimeout          = moduleOptions.nbi_init_timeout;
-      nbiShowMessages         = moduleOptions.show_nbi_messages;
-      nbiIndicateNbiActivity  = moduleOptions.indicate_nbi_activity;
-      nbiInitMathJax          = moduleOptions.nbi_init_mathjax;
-      nbiNotebookReady        = moduleOptions.notebook_ready;
+
+      // Load  module DEFAULTS|CONFIG
+      nbinteractDefaults      = $.extend({}, {{nbinteract_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      nbinteractSettings      = $.extend({}, {{nbinteract_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      nbinteractOptions       = $.extend({}, nbinteractDefaults, nbinteractSettings);
+
+      nbiModalAutoClose       = nbinteractOptions.nbi_messages_auto_close;
+      nbiModalAutoCloseDelay  = nbinteractOptions.nbi_messages_auto_close_delay;
+      nbiInitTimeout          = nbinteractOptions.nbi_init_timeout;
+      nbiShowMessages         = nbinteractOptions.show_nbi_messages;
+      nbiIndicateNbiActivity  = nbinteractOptions.indicate_nbi_activity;
+      nbiInitMathJax          = nbinteractOptions.nbi_init_mathjax;
+      nbiNotebookReady        = nbinteractOptions.notebook_ready;
 
       // -----------------------------------------------------------------------
       // load|configure Mathjax
@@ -205,7 +210,7 @@ j1.adapter.nbinteract = (function (j1, window) {
       // -----------------------------------------------------------------------
       // load|configure NBI dialog (modal)
       // -----------------------------------------------------------------------
-      _this.loadDialog(moduleOptions);
+      _this.loadDialog(nbinteractOptions);
 
       // -----------------------------------------------------------------------
       // load all modals (HTML portion) used by NBI
@@ -215,7 +220,7 @@ j1.adapter.nbinteract = (function (j1, window) {
       // -----------------------------------------------------------------------
       // load all textbooks (HTML portion) configured|enabled
       // -----------------------------------------------------------------------
-      _this.loadNbiTextbooks(moduleOptions);
+      _this.loadNbiTextbooks(nbinteractOptions);
 
       // -----------------------------------------------------------------------
       // run a spinner to indicate activity of 'nbInteract' if enabled
@@ -241,7 +246,7 @@ j1.adapter.nbinteract = (function (j1, window) {
       // connect to the configured BinderHub instance to create a
       // Jupyter kernel if required
       // -----------------------------------------------------------------------
-      _this.interactNbiTextbooks(moduleOptions);
+      _this.interactNbiTextbooks(nbinteractOptions);
 
       // toggle hide|show the FAB button, if to wait on 'last_widget' rendered
       //
@@ -1207,7 +1212,7 @@ j1.adapter.nbinteract = (function (j1, window) {
 
         // stop the (progress) spinner
         //
-        if (moduleOptions.indicate_nbi_activity) {
+        if (nbinteractOptions.indicate_nbi_activity) {
           spinner.stop();
         }
 

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

@@ -88,6 +88,10 @@ j1.adapter.particles = (function (j1, window) {
 -------------------------------------------------------------------------------- {% endcomment %}
 var environment     = '{{environment}}';
 var cookie_names    = j1.getCookieNames();
+var particleDefaults;
+var particleSettings;
+var particleOptions;
+var frontmatterOptions;
 var _this;
 var logger;
 var logText;
@@ -116,14 +120,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 particleDefaults = $.extend({}, {{particles_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
-      var particleSettings = $.extend({}, {{particles_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // merge all options
-      var particleOptions = $.extend({}, particleDefaults, particleSettings, frontmatterOptions);
+      // Load  module DEFAULTS|CONFIG
+      particleDefaults = $.extend({}, {{particles_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      particleSettings = $.extend({}, {{particles_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      particleOptions  = $.extend(true, {}, particleDefaults, particleSettings, frontmatterOptions);
 
       _this  = j1.adapter.particles;
       logger = log4javascript.getLogger('j1.adapter.particles');