j1-template 2023.0.13 → 2023.0.14

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

@@ -92,6 +92,7 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/comments.js
@@ -122,14 +123,18 @@ j1.adapter.comments = (function (j1, window) {
 var environment       = '{{environment}}';
 var date              = new Date();
 var timestamp_now     = date.toISOString();
+var cookie_names      = j1.getCookieNames();
 var comments_provider = '{{comments_provider}}';
 var dqApiScript       = document.createElement('script');
 var hvApiScript       = document.createElement('script');
 var hvCallbackScript  = document.createElement('script');
-var providerID        = '{{site_id}}';
-var validProviderID   = (providerID.includes('your')) ? false : true;
 var comments_headline = '{{comments_headline}}';
-var cookie_names      = j1.getCookieNames();
+var providerID;
+var validProviderID;
+var commentsDefaults;
+var commentsSettings;
+var commentsOptions;
+var frontmatterOptions;
 var user_consent;
 var _this;
 var logger;
@@ -146,224 +151,214 @@ var logText;
     // -------------------------------------------------------------------------
     init: function (options) {
 
-    {% if comments %}
-      // [INFO   ] [j1.adapter.comments                    ] [ detected comments provider (j1_config): {{comments_provider}}} ]
-      // [INFO   ] [j1.adapter.comments                    ] [ start processing load region head, layout: {{page.layout}} ]
-
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.comments',
-        generated:   '{{site.time}}'
-      }, options);
-
       // -----------------------------------------------------------------------
       // Global variable settings
       // -----------------------------------------------------------------------
 
-      // create settings object from frontmatter
-      var frontmatterOptions  = options != null ? $.extend({}, options) : {};
+      // create settings object from frontmatter (page settings)
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
 
-      // create settings object from comment options
-      var commentDefaults = $.extend({}, {{comments_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
-      var commentSettings = $.extend({}, {{comments_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      // Load  module DEFAULTS|CONFIG
+      commentsDefaults          = $.extend({}, {{comments_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      commentsSettings          = $.extend({}, {{comments_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      commentsOptions           = $.extend(true, {}, commentsDefaults, commentsSettings, frontmatterOptions);
 
-      // merge all comment options
-      var commentOptions = $.extend({}, commentDefaults, commentSettings, frontmatterOptions);
-
-      // check comment options from frontmatter
-      if (commentOptions.enabled) {
-      {% if site_id %}
+      // overload module config from page settings (frontmatter)
+      if (typeof commentsOptions.comments !== 'undefined' ) {
+        commentsOptions.enabled = (commentsOptions.comments) === 'true' ? true : false;
+      }
 
-      _this = j1.adapter.comments;
-      logger = log4javascript.getLogger('j1.adapter.comments');
+      if (commentsOptions.enabled) {
+        // [INFO   ] [j1.adapter.comments                    ] [ detected comments provider (j1_config): {{comments_provider}}} ]
+        // [INFO   ] [j1.adapter.comments                    ] [ start processing load region head, layout: {{page.layout}} ]
 
-      {% case comments_provider %}
-      {% when "hyvor" %}
-      // [INFO   ] [j1.adapter.comments                    ] [ place provider: Hyvor Talk ]
+        // ---------------------------------------------------------------------
+        // Default module settings
+        // ---------------------------------------------------------------------
+        var settings = $.extend({
+          module_name: 'j1.adapter.comments',
+          generated:   '{{site.time}}'
+        }, options);
 
-      var dependencies_met_page_ready = setInterval(function() {
-        if (j1.getState() == 'finished') {
+        _this = j1.adapter.comments;
+        logger = log4javascript.getLogger('j1.adapter.comments');
 
-          if (!validProviderID) {
-            logger.warn('\n' + 'invalid site id detected for Hyvor Talk: ' + providerID);
-            logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
-            clearInterval(dependencies_met_page_ready);
-            return false;
-          }
+        // check the site ID to be used for a provider
+        providerID      = (typeof commentsOptions.site_id == "number") ? commentsOptions.site_id.toString() : commentsOptions.hyvor.site_id;
+        validProviderID = (providerID.includes('your')) ? false : true;
 
-          // initialize state flag, issue init message
-          // -------------------------------------------------------------------
-          _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized for provider: ' + comments_provider);
-
-          // place|remove initialization code
-          // -------------------------------------------------------------------
-          user_consent  = j1.readCookie(cookie_names.user_consent);
-          if (user_consent.personalization) {
-            // enable Hyvor Talk
-            // -----------------------------------------------------------------
-            $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
-            logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
-            logger.info('\n' + 'enable comments provider' + ' {{comments_provider}} on siteID: ' + providerID);
+        {% case comments_provider %}
+        {% when "hyvor" %}
+        // [INFO   ] [j1.adapter.comments                    ] [ place provider: Hyvor Talk ]
 
-            // add Hyvor Talk Web API
-            // NOTE: don't change the script id
-            // -----------------------------------------------------------------
-            hvApiScript.id    = 'hyvor-embed';
-            hvApiScript.src   = '//talk.hyvor.com/web-api/embed.js';
-            hvApiScript.async = true;
-            document.head.appendChild(hvApiScript);
+        var dependencies_met_page_ready = setInterval(function() {
+          if (j1.getState() == 'finished') {
 
-            // add Hyvor Talk callback script
-            // -----------------------------------------------------------------
-            hvCallbackScript.id   = 'hyvor-callback';
-            hvCallbackScript.text  = '\n';
-            hvCallbackScript.text += 'var HYVOR_TALK_WEBSITE = ' + providerID + '\n';
-            hvCallbackScript.text += 'var HYVOR_TALK_CONFIG = {' + '\n';
-            hvCallbackScript.text += '		  url: false,' + '\n';
-            hvCallbackScript.text += '      id: false' + '\n';
-            hvCallbackScript.text += '	  };' + '\n';
-            document.head.appendChild(hvCallbackScript);
-
-            // add Hyvor Talk comment container
-            // NOTE: don't change the div id
-            // -----------------------------------------------------------------
-            $('#main-content').append('<div id="hyvor-talk-view"></div>');
+            if (!validProviderID) {
+              logger.warn('\n' + 'invalid site id detected for Hyvor Talk: ' + providerID);
+              logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
+              clearInterval(dependencies_met_page_ready);
+              return false;
+            }
 
-            // add recommended title to the comments iframe for SEO optimization
-            // -------------------------------------------------------------------
-            var dependencies_met_load_provider_finished = setInterval (function () {
-              if ($('#hyvor-talk-view').children().length) {
-                $('#hyvor-talk-iframe').prop('title', 'Hyvor comments iframe');
-                clearInterval(dependencies_met_load_provider_finished);
-              }
-            }, 25);
-          } else {
-            // disable Hyvor Talk
+            // initialize state flag, issue init message
             // -----------------------------------------------------------------
-            logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
-            logger.warn('\n' + 'disable Hyvor Talk on site id: ' + providerID);
+            _this.setState('started');
+            logger.debug('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module is being initialized for provider: ' + comments_provider);
 
-            // remove Hyvor Talk resources
+            // place|remove initialization code
             // -----------------------------------------------------------------
-            $('#leave-a-comment').remove();
-            $('#hyvor-embed').remove();
-            $('#hyvor-callback').remove();
-            $('#hyvor-talk-view').remove();
-          }
-          clearInterval(dependencies_met_page_ready);
-        } // END if getState 'finished'
-      }, 25);
-
-      {% when "disqus" %}
-      // [INFO   ] [j1.adapter.comments                    ] [ place provider: Disqus ]
-      var dependencies_met_page_ready = setInterval(function() {
-        if (j1.getState() == 'finished') {
-
-          if (!validProviderID) {
-            logger.warn('\n' + 'invalid short name detected for Disqus: ' + providerID);
-            logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
+            user_consent  = j1.readCookie(cookie_names.user_consent);
+            if (user_consent.personalization) {
+              // enable Hyvor Talk
+              // ---------------------------------------------------------------
+              $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
+              logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
+              logger.info('\n' + 'enable comments provider' + ' {{comments_provider}} on siteID: ' + providerID);
+
+              // add Hyvor Talk Web API
+              // NOTE: don't change the script id
+              // ---------------------------------------------------------------
+              hvApiScript.id    = 'hyvor-embed';
+              hvApiScript.src   = '//talk.hyvor.com/web-api/embed.js';
+              hvApiScript.async = true;
+              document.head.appendChild(hvApiScript);
+
+              // add Hyvor Talk callback script
+              // ---------------------------------------------------------------
+              hvCallbackScript.id   = 'hyvor-callback';
+              hvCallbackScript.text  = '\n';
+              hvCallbackScript.text += 'var HYVOR_TALK_WEBSITE = "' + providerID + '"\n';
+              hvCallbackScript.text += 'var HYVOR_TALK_CONFIG = {' + '\n';
+              hvCallbackScript.text += '		  url: false,' + '\n';
+              hvCallbackScript.text += '      id: false' + '\n';
+              hvCallbackScript.text += '	  };' + '\n';
+              document.head.appendChild(hvCallbackScript);
+
+              // add Hyvor Talk comment container
+              // NOTE: don't change the div id
+              // ---------------------------------------------------------------
+              $('#main-content').append('<div id="hyvor-talk-view"></div>');
+
+              // add recommended title to the comments iframe for SEO optimization
+              // ---------------------------------------------------------------
+              var dependencies_met_load_provider_finished = setInterval (function () {
+                if ($('#hyvor-talk-view').children().length) {
+                  $('#hyvor-talk-iframe').prop('title', 'Hyvor comments iframe');
+                  clearInterval(dependencies_met_load_provider_finished);
+                }
+              }, 25);
+            } else {
+              // disable Hyvor Talk
+              // ---------------------------------------------------------------
+              logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
+              logger.warn('\n' + 'disable Hyvor Talk on site id: ' + providerID);
+
+              // remove Hyvor Talk resources
+              // ---------------------------------------------------------------
+              $('#leave-a-comment').remove();
+              $('#hyvor-embed').remove();
+              $('#hyvor-callback').remove();
+              $('#hyvor-talk-view').remove();
+            }
             clearInterval(dependencies_met_page_ready);
-            return;
-          }
-
-          // initialize state flag, issue init message
-          // -------------------------------------------------------------------
-          _this.setState('started');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module is being initialized for provider: ' + comments_provider);
-
-          // place|remove initialization code
-          // -------------------------------------------------------------------
-          user_consent  = j1.readCookie(cookie_names.user_consent);
-          if (user_consent.personalization) {
-            $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
-            logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
-            logger.info('\n' + 'enable comments provider' + ' {{comments_provider}} on short name: ' + providerID);
-
-            // old Disqus Web API init
-            // -----------------------------------------------------------------
-            // var disqus_shortname = '{{site_id}}';
-            // // -----------------------------------------------------------------
-            // // RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE
-            // // SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
-            // // LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT:
-            // // https://disqus.com/admin/universalcode/#configuration-variables
-            // // -----------------------------------------------------------------
-            // //
-            // // var disqus_config = function () {
-            // // this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
-            // // Replace PAGE_IDENTIFIER with your page's unique
-            // // identifier variable
-            // // this.page.identifier = PAGE_IDENTIFIER;
-            // // };
-            // //
-            // // DON'T EDIT BELOW THIS LINE
-            // // -----------------------------------------------------------------
-            // (function() {
-            //     var d = document,
-            //         s = d.createElement('script');
-            //     s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            //     s.setAttribute('data-timestamp', +new Date());
-            //     (d.head || d.body).appendChild(s);
-            // })();
-
-            // add|initialize Disqus Web API
+          } // END if getState 'finished'
+        }, 25);
+
+        {% when "disqus" %}
+        // [INFO   ] [j1.adapter.comments                    ] [ place provider: Disqus ]
+        var dependencies_met_page_ready = setInterval(function() {
+          if (j1.getState() == 'finished') {
+
+            if (!validProviderID) {
+              logger.warn('\n' + 'invalid short name detected for Disqus: ' + providerID);
+              logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
+              clearInterval(dependencies_met_page_ready);
+              return;
+            }
+
+            // initialize state flag, issue init message
             // -----------------------------------------------------------------
-            dqApiScript.id    = 'dq-web-api';
-            dqApiScript.src   = '//' + providerID + '.disqus.com/embed.js";'
-            dqApiScript.setAttribute("data-timestamp", '"' + timestamp_now + '"');
-            document.head.appendChild(dqApiScript);
+            _this.setState('started');
+            logger.debug('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module is being initialized for provider: ' + comments_provider);
 
-            // add Disqus comment container
+            // place|remove initialization code
             // -----------------------------------------------------------------
-            $('#main-content').append('<div id="disqus_thread"></div>');
-          } else {
-            logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
-            logger.warn('\n' + 'disable comments provider' + ' {{comments_provider}} on short name: ' + providerID);
-            $('#leave-a-comment').remove();
-            $('#dq-web-api').remove();
-            $('#hdisqus_thread').remove();
-          }
+            user_consent  = j1.readCookie(cookie_names.user_consent);
+            if (user_consent.personalization) {
+              $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
+              logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
+              logger.info('\n' + 'enable comments provider' + ' {{comments_provider}} on short name: ' + providerID);
+
+              // old Disqus Web API init
+              // ---------------------------------------------------------------
+              // var disqus_shortname = '{{site_id}}';
+              // // ------------------------------------------------------------
+              // // RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE
+              // // SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
+              // // LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT:
+              // // https://disqus.com/admin/universalcode/#configuration-variables
+              // // ------------------------------------------------------------
+              // //
+              // // var disqus_config = function () {
+              // // this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
+              // // Replace PAGE_IDENTIFIER with your page's unique
+              // // identifier variable
+              // // this.page.identifier = PAGE_IDENTIFIER;
+              // // };
+              // //
+              // // DON'T EDIT BELOW THIS LINE
+              // // ------------------------------------------------------------
+              // (function() {
+              //     var d = document,
+              //         s = d.createElement('script');
+              //     s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+              //     s.setAttribute('data-timestamp', +new Date());
+              //     (d.head || d.body).appendChild(s);
+              // })();
+
+              // add|initialize Disqus Web API
+              // ---------------------------------------------------------------
+              dqApiScript.id    = 'dq-web-api';
+              dqApiScript.src   = '//' + providerID + '.disqus.com/embed.js";'
+              dqApiScript.setAttribute("data-timestamp", '"' + timestamp_now + '"');
+              document.head.appendChild(dqApiScript);
+
+              // add Disqus comment container
+              // ---------------------------------------------------------------
+              $('#main-content').append('<div id="disqus_thread"></div>');
+            } else {
+              logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
+              logger.warn('\n' + 'disable comments provider' + ' {{comments_provider}} on short name: ' + providerID);
+              $('#leave-a-comment').remove();
+              $('#dq-web-api').remove();
+              $('#hdisqus_thread').remove();
+            }
 
-          // add recommended title to the comments iframe for SEO optimization
-          // -------------------------------------------------------------------
-          // var dependencies_met_load_provider_finished = setInterval (function () {
-          //   if ($('#disqus_thread').children().length) {
-          //     $('#hyvor-talk-iframe').prop('title', 'Disqus comments iframe');
-          //     clearInterval(dependencies_met_load_provider_finished);
-          //   }
-          // }, 25);
-
-          clearInterval(dependencies_met_page_ready);
-        } // END if getState 'finished'
-      }, 25);
-      {% endcase %}
-
-    {% else %}
-      var dependencies_met_page_ready = setInterval(function() {
-        if (j1.getState() == 'finished') {
-          logger = log4javascript.getLogger('j1.adapter.comments');
-          logger.warn('\n' + 'provider or site ID for comment services wrong or not set');
-          clearInterval(dependencies_met_page_ready);
-        }
-      }, 25);
-    {% endif %}
-    } // END if 'commentOptions.comments'
-
-    {% else %}
-      var dependencies_met_page_ready = setInterval(function() {
-        if (j1.getState() == 'finished') {
-          logger = log4javascript.getLogger('j1.adapter.comments');
-          logger.info('\n' + 'comment services: disabled');
-          clearInterval(dependencies_met_page_ready);
-        }
-      }, 25);
-    {% endif %}
+            // add recommended title to the comments iframe for SEO optimization
+            // -----------------------------------------------------------------
+            // var dependencies_met_load_provider_finished = setInterval (function () {
+            //   if ($('#disqus_thread').children().length) {
+            //     $('#hyvor-talk-iframe').prop('title', 'Disqus comments iframe');
+            //     clearInterval(dependencies_met_load_provider_finished);
+            //   }
+            // }, 25);
 
+            clearInterval(dependencies_met_page_ready);
+          } // END if getState 'finished'
+        }, 25);
+        {% endcase %}
+      } else {
+        var dependencies_met_page_ready = setInterval(function() {
+          if (j1.getState() == 'finished') {
+            logger = log4javascript.getLogger('j1.adapter.comments');
+            logger.info('\n' + 'comment services: disabled');
+            clearInterval(dependencies_met_page_ready);
+          }
+        }, 25);
+      } // END if 'commentsOptions.comments'
 
     }, // END init
 

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

@@ -90,7 +90,9 @@ j1.adapter.cookieConsent = (function (j1, window) {
   var tracking_id                 = '{{tracking_id}}';
   var tracking_id_valid           = (tracking_id.includes('tracking-id')) ? false : true;
   var expireCookiesOnRequiredOnly = ('{{cookie_options.expireCookiesOnRequiredOnly}}' === 'true') ? true: false;
-  var moduleOptions               = {};
+  var cookieConsentDefaults;
+  var cookieConsentSettings;
+  var cookieConsentOptions;
   var _this;
   var $modal;
   var cookie_names;
@@ -149,6 +151,11 @@ j1.adapter.cookieConsent = (function (j1, window) {
       contentLanguage       = '{{site.language}}';
       navigatorLanguage     = navigator.language || navigator.userLanguage;
 
+      // Load  module DEFAULTS|CONFIG
+      cookieConsentDefaults          = $.extend({}, {{consent_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      cookieConsentSettings          = $.extend({}, {{consent_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      cookieConsentOptions           = $.extend(true, {}, cookieConsentDefaults, cookieConsentSettings);
+
       // initialize state flag
       _this.state = 'pending';
 
@@ -156,17 +163,17 @@ j1.adapter.cookieConsent = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       /* eslint-disable */
-      moduleOptions = $.extend({}, {{consent_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      // moduleOptions = $.extend({}, {{consent_options | replace: '=>', ':' | replace: 'nil', '""'}});
       /* eslint-enable */
 
-      if (typeof settings !== 'undefined') {
-        moduleOptions = $.extend({}, moduleOptions, settings);
-      }
+      // if (typeof settings !== 'undefined') {
+      //   moduleOptions = $.extend({}, moduleOptions, settings);
+      // }
 
-      if (moduleOptions.dialogLanguage === 'auto') {
-        moduleOptions.dialogLanguage = navigatorLanguage;
-      } else if (moduleOptions.dialogLanguage === 'content') {
-        moduleOptions.dialogLanguage = contentLanguage;
+      if (cookieConsentOptions.dialogLanguage === 'auto') {
+        cookieConsentOptions.dialogLanguage = navigatorLanguage;
+      } else if (cookieConsentOptions.dialogLanguage === 'content') {
+        cookieConsentOptions.dialogLanguage = contentLanguage;
       }
 
       // -----------------------------------------------------------------------
@@ -176,7 +183,7 @@ j1.adapter.cookieConsent = (function (j1, window) {
         var same_site = '{{cookie_options.same_site}}';
         var expires;
 
-        if (moduleOptions.enabled) {
+        if (cookieConsentOptions.enabled) {
           expires = '{{cookie_options.expires}}';
         } else {
           // expire permanent cookies to session
@@ -216,23 +223,23 @@ j1.adapter.cookieConsent = (function (j1, window) {
           _this.setState('started');
 
 
-          if (moduleOptions.enabled) {
+          if (cookieConsentOptions.enabled) {
             logger.debug('\n' + 'state: ' + _this.getState());
             logger.info('\n' + 'module is being initialized');
 
             j1.cookieConsent = new CookieConsent ({
-              contentURL:             moduleOptions.contentURL,                   // dialog content (modals) for all supported languages
+              contentURL:             cookieConsentOptions.contentURL,                   // dialog content (modals) for all supported languages
               cookieName:             cookie_names.user_consent,                  // name of the consent cookie
               cookieStorageDays:      expires,                                    // lifetime of a cookie [0..365], 0: session cookie
               cookieSameSite:         same_site,                                  // restrict consent cookie
               cookieSecure:           secure,                                     // only sent to the server with an encrypted request over HTTPS
               cookieDomain:           domainAttribute,                            // set domain (hostname|domain)
-              dialogLanguage:         moduleOptions.dialogLanguage,               // language for the dialog (modal)
-              whitelisted:            moduleOptions.whitelisted,                  // pages NO cookie dialog is shown
-              reloadPageOnChange:     moduleOptions.reloadPageOnChange,           // reload if setzings has changed
-              dialogContainerID:      moduleOptions.dialogContainerID,            // container, the dialog modal is (dynamically) loaded
-              xhrDataElement:         moduleOptions.xhrDataElement,               // container for all language-specific dialogs (modals)
-              postSelectionCallback:  moduleOptions.postSelectionCallback,        // callback function, called after the user has made his selection
+              dialogLanguage:         cookieConsentOptions.dialogLanguage,               // language for the dialog (modal)
+              whitelisted:            cookieConsentOptions.whitelisted,                  // pages NO cookie dialog is shown
+              reloadPageOnChange:     cookieConsentOptions.reloadPageOnChange,           // reload if setzings has changed
+              dialogContainerID:      cookieConsentOptions.dialogContainerID,            // container, the dialog modal is (dynamically) loaded
+              xhrDataElement:         cookieConsentOptions.xhrDataElement,               // container for all language-specific dialogs (modals)
+              postSelectionCallback:  cookieConsentOptions.postSelectionCallback,        // callback function, called after the user has made his selection
             });
           } else {
             logger.warn('\n' + 'module is disabled');
@@ -351,7 +358,7 @@ j1.adapter.cookieConsent = (function (j1, window) {
           j1.expireCookie({ name: cookie_names.user_consent });
           j1.expireCookie({ name: cookie_names.user_translate });
         }
-        if (moduleOptions.reloadPageOnChange) {
+        if (cookieConsentOptions.reloadPageOnChange) {
           // reload current page (skip cache)
           location.reload(true);
         }
@@ -412,7 +419,7 @@ j1.adapter.cookieConsent = (function (j1, window) {
           }
         }
 
-        if (moduleOptions.reloadPageOnChange) {
+        if (cookieConsentOptions.reloadPageOnChange) {
           // reload current page (skip cache)
           location.reload(true);
         }

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

@@ -83,9 +83,10 @@ j1.adapter.dropdowns = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var moduleOptions = {};
   var instances     = [];
-  var frontmatterOptions;
+  var dropdownsDefaults;
+  var dropdownsSettings;
+  var dropdownsOptions;
   var _this;
   var logger;
   var logText;
@@ -118,20 +119,16 @@ j1.adapter.dropdowns = (function (j1, window) {
       _this   = j1.adapter.dropdowns;
       logger  = log4javascript.getLogger('j1.adapter.dropdowns');
 
+      // Load  module DEFAULTS|CONFIG
+      dropdownsDefaults = $.extend({}, {{comments_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      dropdownsSettings = $.extend({}, {{comments_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      dropdownsOptions  = $.extend(true, {}, dropdownsDefaults, dropdownsSettings);
 
       // 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({}, {{dropdowns_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = $.extend({}, moduleOptions, frontmatterOptions);;
-      }
-
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
           var elms = document.querySelectorAll('.dropdowns');

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

@@ -90,6 +90,8 @@ j1.adapter.fab = (function (j1, window) {
   var dclFinished   = false;
   var moduleOptions = {};
   var cookie_names  = j1.getCookieNames();
+  var fabDefaults;
+  var fabSettings;
   var fabOptions;
   var frontmatterOptions;
   var user_state;
@@ -139,31 +141,22 @@ j1.adapter.fab = (function (j1, window) {
       logger.info('\n' + 'set module state to: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // create settings object from frontmatterOptions
-      var frontmatterOptions = options != null ? $.extend({}, options) : {};
+      // create settings object from frontmatter (page settings)
+      frontmatterOptions  = options != null ? $.extend({}, options) : {};
 
-      // -----------------------------------------------------------------------
-      // options loader
-      // -----------------------------------------------------------------------
-      /* eslint-disable */
-      fabOptions = $.extend({}, {{fab_options | replace: 'nil', 'null' | replace: '=>', ':' }});
-
-      // Load (individual) frontmatter options (currently NOT used)
-      if (options != null) { frontmatterOptions = $.extend({}, options); }
-
-      if (typeof frontmatterOptions !== 'undefined') {
-        moduleOptions = $.extend({}, fabOptions, frontmatterOptions);
-      }
-      /* eslint-enable */
+      // Load  module DEFAULTS|CONFIG
+      fabDefaults = $.extend({}, {{fab_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      fabSettings = $.extend({}, {{fab_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      fabOptions  = $.extend(true, {}, fabDefaults, fabSettings, frontmatterOptions);
 
       // save config settings into the FAB object for global access
       //
-      _this['moduleOptions'] = moduleOptions;
+      _this['moduleOptions'] = fabOptions;
 
       var dependencies_met_navigator = setInterval(function() {
         if (j1.adapter.navigator.getState() == 'finished') {
           logger.debug('\n' + 'met dependencies for: navigator');
-          _this.fabLoader(moduleOptions);
+          _this.fabLoader(fabOptions);
           clearInterval(dependencies_met_navigator);
         }
       }, 25);