j1-template 2022.0.12 → 2022.0.16

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

@@ -60,8 +60,8 @@ regenerate:                             true
 {% assign themer_defaults           = modules.defaults.themer.defaults %}
 {% assign themer_settings           = modules.themer.settings %}
 
-{% assign tracking_enabled          = template_config.analytics.enabled %}
-{% assign tracking_id               = template_config.analytics.google.tracking_id %}
+{% assign tracking_enabled          = modules.analytics.enabled %}
+{% assign tracking_id               = modules.analytics.google.trackingID %}
 
 {% assign authentication_defaults   = modules.defaults.authentication.defaults %}
 {% assign authentication_settings   = modules.authentication.settings %}
@@ -134,24 +134,25 @@ var j1 = (function () {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var rePager                   =  new RegExp('navigator|dateview|tagview|archive');
-  var environment               = '{{environment}}';
-  var moduleOptions             = {};
-  var j1_runtime_data           = {};
+  var rePager                     =  new RegExp('navigator|dateview|tagview|archive');
+  var environment                 = '{{environment}}';
+  var moduleOptions               = {};
+  var j1_runtime_data             = {};
 
   // Status information
-  var state                     = 'not_started';
-  var mode                      = 'not_detected';
+  var state                       = 'not_started';
+  var mode                        = 'not_detected';
 
   // Default tracking provider information
-  var tracking_enabled          = ('{{tracking_enabled}}' === 'true') ? true: false;
-  var tracking_id               = '{{tracking_id}}';
-  var tracking_id_valid         = (tracking_id.includes('tracking-id')) ? false : true;
+  // var tracking_enabled            = ('{{tracking_enabled}}' === 'true') ? true: false;
+  // var tracking_id                 = '{{tracking_id}}';
+  // var tracking_id_valid           = (tracking_id.includes('tracking-id')) ? false : true;
 
   // Default comment provider information
-  var comment_provider          = '{{comment_provider}}';
-  var site_id                   = '{{site_id}}';
-  var check_cookies             = {{cookie_options.check_cookies}};
+  var comment_provider            = '{{comment_provider}}';
+  var site_id                     = '{{site_id}}';
+  var checkCookies                = {{cookie_options.checkCookies}};
+  var expireCookiesOnRequiredOnly = ('{{cookie_options.expireCookiesOnRequiredOnly}}' === 'true') ? true: false;
 
   var current_user_data;
   var current_page;
@@ -252,7 +253,15 @@ var j1 = (function () {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // global var (function)
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       var logger            = log4javascript.getLogger('j1.init');
       var url               = new liteURL(window.location.href);
@@ -264,18 +273,8 @@ var j1 = (function () {
       var timestamp_now     = date.toISOString();
       var curr_state        = 'started';
       var gaCookies         = j1.findCookie('_ga');
-      var j1Cookies         = j1.findCookie('j1');
       var themerOptions     = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
-      // -----------------------------------------------------------------------
-      // options loader
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        foo: 'foo_option',
-        bar: 'bar_option'
-        },
-        options
-      );
       // -----------------------------------------------------------------------
       // status settings
       // save status into the adapter object for (later) global access
@@ -346,22 +345,13 @@ var j1 = (function () {
                             expires:  365
                           });
 
-      // jadams, 2021-12-06: Check if access to cookies for this site failed.
-      // Possibly, a third-party domain or an attacker tries to access it.
-      if (check_cookies) {
-        if (!user_state) {
-          logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
-          logger.debug('\n' + 'j1 cookies found:' + j1Cookies.length);
-          // redirect to error page: blocked content
-          window.location.href = '/446.html';
-        }
-      }
-
       if (!user_consent.analysis || !user_consent.personalization)  {
-        // expire permanent cookies to session
-        j1.expireCookie({ name: cookie_names.user_state });
-        j1.expireCookie({ name: cookie_names.user_consent });
-        j1.expireCookie({ name: cookie_names.user_translate });
+        if (expireCookiesOnRequiredOnly) {
+          // expire permanent cookies to session
+          j1.expireCookie({ name: cookie_names.user_state });
+          j1.expireCookie({ name: cookie_names.user_consent });
+          j1.expireCookie({ name: cookie_names.user_translate });
+        }
       }
 
       // initialize event handler for window/history/back on <ESC>
@@ -900,6 +890,20 @@ var j1 = (function () {
             // display page
             $('#no_flicker').css('display', 'block');
 
+            // jadams, 2021-12-06: Check if access to cookies for this site failed.
+            // Possibly, a third-party domain or an attacker tries to access it.
+            if (checkCookies) {
+              var j1Cookies = j1.findCookie('j1');
+              if (!j1.existsCookie(cookie_names.user_state)) {
+                logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
+                logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+                // redirect to error page: blocked content
+                window.location.href = '/446.html';
+              } else {
+                logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+              }
+            }
+
             // manage Dropcaps if translation is enabled|disabled
             // -----------------------------------------------------------------
             if (user_translate.translationEnabled) {
@@ -1006,6 +1010,20 @@ var j1 = (function () {
           // display the page loaded
           $('#no_flicker').css('display', 'block');
 
+          // jadams, 2021-12-06: Check if access to cookies for this site failed.
+          // Possibly, a third-party domain or an attacker tries to access it.
+          if (checkCookies) {
+            var j1Cookies = j1.findCookie('j1');
+            if (!j1.existsCookie(cookie_names.user_state)) {
+              logger.error('\n' + 'Access to cookie failed or cookie not found: ' + cookie_names.user_state);
+              logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+              // redirect to error page: blocked content
+              window.location.href = '/446.html';
+            } else {
+              logger.info('\n' + 'j1 cookies found:' + j1Cookies.length);
+            }
+          }
+
           // jadams, 2021-11-19: test code for 'tapTarget' of 'materializeCss'
           // See:
           //  https://stackoverflow.com/questions/49422111/opening-tap-target-in-materialize-css-for-2-seconds
@@ -1509,22 +1527,19 @@ var j1 = (function () {
       var baseUrl               = url.origin;;
       var hostname              = url.hostname;
       var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
       var stringifiedAttributes = '';
       var cookie_data           = {};
       var data_json;
       var data_encoded;
-      var expires;
-      var domainAttribute;
 
       var defaults = {
-          data:         {},
-          name:         '',
-          path:         '{{cookie_options.path}}',
-          expires:      '{{cookie_options.expires}}',
-          domain:       ('{{cookie_options.domain}}' === 'true'),               // convert string to boolean
-          samesite:     '{{cookie_options.same_site}}',
-          http_only:    '{{cookie_options.http_only}}',
-          secure:       '{{cookie_options.secure}}'
+        path:         '{{cookie_options.path}}',
+        expires:      '{{cookie_options.expires}}',
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
+        samesite:     '{{cookie_options.same_site}}',
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
       var settings = $.extend(defaults, options);
 
@@ -1547,6 +1562,8 @@ var j1 = (function () {
         data_encoded  = window.btoa(data_json);
       }
 
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
       stringifiedAttributes += '; ' + 'Path=' + settings.path;
 
       if (settings.expires > 0) {
@@ -1559,20 +1576,23 @@ var j1 = (function () {
       // set domain used by cookies
       if (settings.domain) {
         if (settings.domain == 'auto') {
-          domainAttribute = auto_domain;
-          stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
-        } else if (settings.domain)  {
-          domainAttribute = settings.domain;
-          stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else {
+          stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
         }
       }
 
-      if (settings.secure == true) {
-        stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
       }
 
       // write the cookie
-//    document.cookie = settings.name + '=' + content + '; path=' + settings.path + '; domain=' + settings.domain + '; ' + 'SameSite=' + settings.samesite + '; secure';
+      // -----------------------------------------------------------------------
       document.cookie = settings.name + '=' + data_encoded + stringifiedAttributes;
 
       if (j1.existsCookie(settings.name)) {
@@ -1580,14 +1600,13 @@ var j1 = (function () {
       } else {
         return false;
       }
-
     },
 
     // -------------------------------------------------------------------------
     // findCookie (Vanilla JS)
-    // Search for cookies (names) in the page header that matches a given
-    // name. Cookie name can be give as full name, like 'j1.user.state', or
-    // as a partial like 'j1'
+    // Search for cookies (by name) in the page header that matches a given
+    // (name) string. A cookie name can be given as full name, like 'j1.user.state',
+    // or as a partial like 'j1'
     // Returns all names found as an array.
     // -------------------------------------------------------------------------
     // See: https://stackoverflow.com/questions/52287989/javascript-cookie-remove-or-delete-with-regex-regular-expression
@@ -1603,31 +1622,51 @@ var j1 = (function () {
     // removeCookie (Vanilla JS)
     // -------------------------------------------------------------------------
     removeCookie: function (options /*name, [path, domain]*/) {
-      var domainAttribute;
+      var url                   = new liteURL(window.location.href);
+      var baseUrl               = url.origin;;
+      var hostname              = url.hostname;
+      var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
+      var stringifiedAttributes = '';
 
       var defaults = {
         path:         '{{cookie_options.path}}',
-        expires:      '{{cookie_options.expires}}',
-        domain:       '{{cookie_options.domain}}',
+        expires:      'Thu, 01 Jan 1970 00:00:00 UTC',                          // clear cookies by settting the expiry date in the PAST
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
         samesite:     '{{cookie_options.same_site}}',
-        http_only:    '{{cookie_options.http_only}}',
-        secure:       '{{cookie_options.secure}}'
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
-      var cookieExists;
+      var settings  = $.extend(defaults, options);
 
-      var settings = $.extend(defaults, options);
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
+      stringifiedAttributes += '; ' + 'Path=' + settings.path;
+      stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+      stringifiedAttributes += '; ' + 'Expires=' + settings.expires;
 
       // set domain used by cookies
-      if (settings.domain == 'auto') {
-        domainAttribute = domain ;
-      } else  {
-        // domainAttribute = hostname;
-        domainAttribute = '';
+      if (settings.domain) {
+        if (settings.domain == 'auto') {
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else if (typeof settings.domain == 'string') {
+          stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
+        }
+      }
+
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
       }
 
+      // clear|remove the cookie if exists
+      // -----------------------------------------------------------------------
       if (j1.findCookie(settings.name)) {
-        // clear cookie CONTENT and set expiry date in the PAST
-        document.cookie = settings.name + '=; Domain=' + domainAttribute + '; Expires=Thu, 01 Jan 1970 00:00:00 UTC; Path=/;';
+        document.cookie = settings.name + '=;' + stringifiedAttributes;
         return true;
       } else {
         return false;
@@ -1642,49 +1681,71 @@ var j1 = (function () {
     // automatically by the browser if the last session (browser tab|window)
     // is closed.
     // -------------------------------------------------------------------------
-    // expireCookie() returns 'true' if cookie is set successfully,
-    // otherwise 'false' (e.g NOT found)
+    // expireCookie() returns 'true' if cookie is set successfully
+    // (to session), otherwise 'false' (e.g. NOT found)
     // -------------------------------------------------------------------------
     // NOTE:
     // See: https://stackoverflow.com/questions/179355/clearing-all-cookies-with-javascript
+    //
     // NOTE:
     // There is NO way you could get a trace of Path, Domain and other
     // attributes of cookies as they are only read by browsers and NOT shown
-    // to JavaScript. For that reason, attributes needs to be set explicitly.
+    // to JavaScript. For that reason, attributes needs to be set explicitly
+    // to already KNOWN values.
+    //
     // -------------------------------------------------------------------------
     expireCookie: function (options /*name [,path, samesite, secure]*/) {
-      var url             = new liteURL(window.location.href);
-      var baseUrl         = url.origin;;
-      var hostname        = url.hostname;
-      var domain          = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      var domainAttribute;
+      var url                   = new liteURL(window.location.href);
+      var baseUrl               = url.origin;;
+      var hostname              = url.hostname;
+      var auto_domain           = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var auto_secure           = (url.protocol.includes('https')) ? true : false;
+      var stringifiedAttributes = '';
 
       var defaults = {
         path:         '{{cookie_options.path}}',
         expires:      '{{cookie_options.expires}}',
-        domain:       '{{cookie_options.domain}}',
+        domain:       ('{{cookie_options.domain}}' === 'false') ? false : '{{cookie_options.domain}}',
         samesite:     '{{cookie_options.same_site}}',
-        http_only:    '{{cookie_options.http_only}}',
-        secure:       '{{cookie_options.secure}}'
+        http_only:    ('{{cookie_options.http_only}}' === 'true'),
+        secure:       ('{{cookie_options.secure}}' === 'false') ? false : '{{cookie_options.secure}}'
       };
       var settings  = $.extend(defaults, options);
 
+      // collect the cookie attributes
+      // -----------------------------------------------------------------------
+      stringifiedAttributes += '; ' + 'Path=' + settings.path;
+      stringifiedAttributes += '; ' + 'SameSite=' + settings.samesite;
+
       // set domain used by cookies
-      if (settings.domain == 'auto') {
-        domainAttribute = domain ;
-      } else  {
-        // domainAttribute = hostname;
-        domainAttribute = '';
+      if (settings.domain) {
+        if (settings.domain == 'auto') {
+          stringifiedAttributes += '; ' + 'Domain=' + auto_domain;
+        } else if (typeof settings.domain == 'string') {
+          if (settings.domain !== 'false') {
+            stringifiedAttributes += '; ' + 'Domain=' + settings.domain;
+          }
+        }
       }
 
-      var dc        = document.cookie;                                            // all cookies in page
-      var end       = dc.length;                                                  // default to end of the string
-      var prefix    = settings.name + '=';                                                 // search string for the cookie name given
+      // set secure attribute
+      if (settings.secure) {
+        if (settings.secure == 'auto') {
+          stringifiedAttributes += '; ' + 'Secure=' + auto_secure;
+        } else {
+          stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
+        }
+      }
+
+      var dc        = document.cookie;                                          // all cookies in page
+      var end       = dc.length;                                                // default to end of the string
+      var prefix    = settings.name + '=';                                      // search string for the cookie name given
       var begin     = dc.indexOf('; ' + prefix);
       var content   = '';
 
       // collect the cookie content
-      //
+      // -----------------------------------------------------------------------
+
       // found, and not in the first position
       if (begin !== -1) {
         // exclude the "; "
@@ -1702,20 +1763,17 @@ var j1 = (function () {
         end = dc.indexOf(';', begin);
       }
 
-      // expire cookie to session
+      // write the cookie content, expire to session
+      // -----------------------------------------------------------------------
       content = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
-      if (settings.secure == 'true') {
-        document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; Secure' + '; ';
-      } else {
-        document.cookie = settings.name + '=' + content +'; Path=' + settings.path + '; ' + 'SameSite=' + settings.samesite + '; ' + 'Domain=' + domainAttribute + '; ';
-      }
+      document.cookie = settings.name + '=' + content + stringifiedAttributes;
 
       return true;
     },
 
     // -------------------------------------------------------------------------
     // existsCookie (Vanilla JS)
-    // returns true if a given cookie exists
+    // returns true if a cookie of given name exists
     // -------------------------------------------------------------------------
     existsCookie: function (name) {
       var dc            = document.cookie;
@@ -1725,6 +1783,9 @@ var j1 = (function () {
       var cookieExists  = false;
       var cookieContent = '';
 
+      // collect the cookie content
+      // -----------------------------------------------------------------------
+
       // found, and not in first position
       if (begin !== -1) {
         // exclude the "; "
@@ -1742,6 +1803,8 @@ var j1 = (function () {
         end = dc.indexOf(';', begin);
       }
 
+      // check if the cookie exists
+      // -----------------------------------------------------------------------
       cookieContent = decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
       cookieExists  = cookieContent.length ? true : false;
 

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

@@ -100,16 +100,6 @@ j1.adapter.justifiedGallery = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function (options) {
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this = j1.adapter.justifiedGallery;
-      logger = log4javascript.getLogger('j1.adapter.justifiedGallery');
-
-      // initialize state flag
-      _this.setState('started');
-      logger.info('\n' + 'state: ' + _this.getState());
-      logger.info('\n' + 'module is being initialized');
-
       // -----------------------------------------------------------------------
       // Default module settings
       // -----------------------------------------------------------------------
@@ -118,6 +108,17 @@ j1.adapter.justifiedGallery = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
+      // -----------------------------------------------------------------------
+      // Global variable settings
+      // -----------------------------------------------------------------------
+      _this = j1.adapter.justifiedGallery;
+      logger = log4javascript.getLogger('j1.adapter.justifiedGallery');
+
+      // initialize state flag
+      _this.setState('started');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module is being initialized');
+
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG

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

@@ -111,7 +111,15 @@ j1.adapter.justifiedGalleryCustomizer = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.justifiedGalleryCustomizer',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.justifiedGalleryCustomizer;
       logger  = log4javascript.getLogger('j1.adapter.justifiedGalleryCustomizer');
@@ -121,14 +129,6 @@ j1.adapter.justifiedGalleryCustomizer = (function (j1, window) {
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.justifiedGalleryCustomizer',
-        generated:   '{{site.time}}'
-      }, options);
-
       {% comment %} Load gallery config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       /* eslint-disable */

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

@@ -102,16 +102,23 @@ j1.adapter.lightbox = (function (j1, window) {
     // -------------------------------------------------------------------------
     // Initializer
     // -------------------------------------------------------------------------
-    init: function () {
-      // initialize state flag
-      j1.adapter.lightbox.state = 'pending';
+    init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.lightbox',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.lightbox;
       logger  = log4javascript.getLogger('j1.adapter.lightbox');
 
+      j1.adapter.lightbox.state = 'pending';
       _this.setState('started');
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');

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

@@ -175,7 +175,14 @@ j1.adapter.logger = (function (j1, window) {
       // initialize state flag
       j1.adapter.logger.state = 'started';
 
-      // load module DEFAULTS|CONFIG to js object
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.logger',
+        generated:   '{{site.time}}'
+      }, options);
+
       /* eslint-disable */
       loggerOptions       = $.extend({}, {{logger_options | replace: '=>', ':' | replace: 'nil', '""'}});
       utilServerOptions   = $.extend({}, {{util_server_options | replace: '=>', ':' | replace: 'nil', '""'}});
@@ -183,8 +190,8 @@ j1.adapter.logger = (function (j1, window) {
       ajaxAppenderOptions = loggerOptions.appenders[1].appender;
 
       // -----------------------------------------------------------------------
-      // setup logger instances
-      //
+      // Global variable settings
+      // -----------------------------------------------------------------------
       _this       = j1.adapter.logger;
       logger      = log4javascript.getLogger('j1.adapter.logger');
 

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

@@ -135,7 +135,15 @@ j1.adapter.mmenu = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.mmenu',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this         = j1.adapter.mmenu;
       logger        = log4javascript.getLogger('j1.adapter.mmenu');
@@ -145,14 +153,6 @@ j1.adapter.mmenu = (function (j1, window) {
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // defaults
-      // -----------------------------------------------------------------------
-      var settings  = $.extend({
-        module_name: 'j1.adapter.mmenu',
-        generated:   '{{site.time}}'
-      }, options);
-
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------

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

@@ -202,7 +202,15 @@ j1.adapter.navigator = (function (j1, window) {
     init: function (options) {
 
       // -----------------------------------------------------------------------
-      // globals
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.navigator',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
       // -----------------------------------------------------------------------
       _this         = j1.adapter.navigator;
       logger        = log4javascript.getLogger('j1.adapter.navigator');
@@ -212,14 +220,6 @@ j1.adapter.navigator = (function (j1, window) {
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // defaults
-      // -----------------------------------------------------------------------
-      var settings  = $.extend({
-        module_name: 'j1.adapter.navigator',
-        generated:   '{{site.time}}'
-      }, options);
-
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------