j1-template 2020.0.12 → 2020.0.17

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

@@ -102,8 +102,16 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      {% comment %} Set global variables
+      -------------------------------------------------------------------------- {% endcomment %}
+      _this = j1.adapter.jf_gallery;
+      logger = log4javascript.getLogger('j1.adapter.jf_gallery');
+
       // initialize state flag
-      j1.adapter.jf_gallery.state = 'pending';
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -125,18 +133,11 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
         moduleOptions = j1.mergeData(moduleOptions, settings);
       }
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this = j1.adapter.jf_gallery;
-      logger = log4javascript.getLogger('j1.adapter.jf_gallery');
-
-      _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
-
       _this.initialize(moduleOptions);
 
-      return true;
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initialized successfully');
     },
 
     // -----------------------------------------------------------------------
@@ -242,7 +243,7 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
 
             // Collect html5 video gallery data from data file (xhr_data_path)
             $.getJSON('{{jf_gallery_options.xhr_data_path}}', function (data) {
-              var play_button = '/assets/themes/j1/extensions/lightGallery/css/themes/icons/play-button.png';
+              var play_button = '/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png';
               var content = '';
               var gallery_class = 'justified-gallery';
               {% if lightbox == "lg" %}
@@ -268,12 +269,12 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
                   {% endif %}
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_lightbox+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/extensions/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
                 } else {
                   content +=  '<a data-sub-html="' +captions_gallery+ '" ';
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_gallery+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/extensions/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
                 }
                 content +=  '</a>' + '\n';
 
@@ -402,20 +403,20 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.jf_gallery.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.jf_gallery.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -110,8 +110,9 @@ j1.adapter['lightbox'] = (function (j1, window) {
       // initialize state flag
       j1.adapter.lightbox.state = 'pending';
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
       _this   = j1.adapter.lightbox;
       logger  = log4javascript.getLogger('j1.adapter.lightbox');
 
@@ -171,20 +172,20 @@ j1.adapter['lightbox'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.lightbox.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.lightbox.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -83,7 +83,7 @@ j1.adapter['logger'] = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment           = '{{environment}}';
-  var page_id               = uuid().slice(25, 37);
+  var page_id               = j1.generateId(12);
   var cookie_names          = j1.getCookieNames();
   var loggerRequestCallback = false;
   var loggerOptions         = {};
@@ -192,6 +192,7 @@ j1.adapter['logger'] = (function (j1, window) {
 
         if (user_session.mode !== 'na') {
           clearInterval(dependencies_met_mode_detected);
+          logger.info('met dependencies for: mode detected');
           appDetected = user_session.mode === 'app' ? true : false;
 
           if (appDetected) {
@@ -266,11 +267,9 @@ j1.adapter['logger'] = (function (j1, window) {
             logger.info('ajax appender detected as: disabled');
           }
 
-          _this.setState('started');
-          logger.info('state: ' + _this.getState());
-
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
 
           return true;
         }

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

@@ -70,46 +70,43 @@ j1.adapter['mdb'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-      // initialize state flag
-      j1.adapter.mdb.state = 'pending';
 
       // -----------------------------------------------------------------------
-      // Default module settings
+      // globals
       // -----------------------------------------------------------------------
-      var settings = $.extend({
-        module_name: 'j1.adapter.mdb',
-        generated:   '{{site.time}}'
-      }, options);
-
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.mdb;
       logger  = log4javascript.getLogger('j1.adapter.mdb');
 
+      // initialize state flag
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.mdb',
+        generated:   '{{site.time}}'
+      }, options);
+
       // -----------------------------------------------------------------------
       // MDB initializer
       // -----------------------------------------------------------------------
       var log_text = 'MDB is being initialized';
       logger.info(log_text);
-      $(document).ready(function() {
-        var dependencies_met_page_ready = setInterval(function() {
-          // delay initMDB until page is visible and
-          // fully available with the DOM
-          if (j1.getState() == 'finished') {
-            j1.initMDB(settings);
-            _this.setState('finished');
-            logger.info('state: ' + _this.getState());
-            logger.info('initializieng module is: finished');
-            clearInterval(dependencies_met_page_ready);
-          }
-        }, 25);
-      });
 
-      return true;
+      var dependencies_met_j1_finished = setInterval(function() {
+        if (j1.getState() == 'finished') {
+          $('body').bootstrapMaterialDesign();
+
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+
+          clearInterval(dependencies_met_j1_finished);
+        } // END dependencies_met_j1_finished
+      }, 25);
+
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -140,20 +137,20 @@ j1.adapter['mdb'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.mdb.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.mdb.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -43,14 +43,15 @@ regenerate: true
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config                   = site %}
 {% assign template_config               = site.data.template_settings %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
 
 {% assign template_config               = site.data.template_settings %}
-{% assign navigator_defaults            = site.data.modules.defaults.navigator.defaults %}
-{% assign navigator_settings            = site.data.modules.navigator.settings %}
+{% assign navigator_defaults            = modules.defaults.navigator.defaults %}
+{% assign navigator_settings            = modules.navigator.settings %}
+{% assign themer_defaults               = modules.defaults.themer.defaults %}
+{% assign themer_settings               = modules.themer.settings %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -60,6 +61,7 @@ regenerate: true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign navigator_options             = navigator_defaults | merge: navigator_settings %}
+{% assign themer_options                = themer_defaults | merge: themer_settings %}
 {% assign nav_mmenu_options             = nav_mmenu_defaults | merge: nav_mmenu_settings %}
 {% assign nav_mmenu_id                  = navigator_defaults.nav_mmenu.xhr_container_id %}
 {% assign nav_navbar_media_breakpoint   = navigator_defaults.nav_bar.media_breakpoint %}
@@ -105,10 +107,10 @@ j1.adapter['mmenu'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment         = '{{environment}}';
-  var dclFinished         = false;
-  var moduleOptions       = {};
-  var cookie_names        = j1.getCookieNames();
+  var environment   = '{{environment}}';
+  var dclFinished   = false;
+  var moduleOptions = {};
+  var cookie_names  = j1.getCookieNames();
   var user_state;
   var user_session;
   var user_data;
@@ -129,8 +131,17 @@ j1.adapter['mmenu'] = (function (j1, window) {
     // module initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this         = j1.adapter.mmenu;
+      logger        = log4javascript.getLogger('j1.adapter.mmenu');
+
       // initialize state flag
-      j1.adapter.mmenu.state = 'pending';
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       // -----------------------------------------------------------------------
       // defaults
@@ -140,12 +151,6 @@ j1.adapter['mmenu'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this         = j1.adapter.mmenu;
-      logger        = log4javascript.getLogger('j1.adapter.mmenu');
-
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
@@ -157,7 +162,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
       // save config settings into the mmenu object for global access
       //
-      j1.adapter.mmenu['navMenuOptions'] = navMenuOptions;
+      _this['navMenuOptions'] = navMenuOptions;
 
       // Load (individual) frontmatter options (currently NOT used)
       //
@@ -166,28 +171,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
-
-      // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
-      // for J1 Navigator to finish (init)
-      //
-      var interval_count = 0;
-      var max_count      = 100;
-
-      var dependencies_met_navigator = setInterval(function() {
-        interval_count += 1;
-        if ( j1.adapter.navigator.getState() == 'finished' ) {
-          logger.info('dependencies of module navigator met for: mmenu');
-          logger.info('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          j1.adapter.mmenu.mmenuLoader(navMenuOptions);
-          clearInterval(dependencies_met_navigator);
-        }
-        if (interval_count > max_count) {
-          logger.warn('dependency check failed for module: navigator');
-          logger.warn('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          clearInterval(dependencies_met_navigator);
-          j1.adapter.mmenu.mmenuLoader(navMenuOptions);
-        }
-      }, 25);
+      _this.mmenuLoader(navMenuOptions);
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -221,48 +205,38 @@ j1.adapter['mmenu'] = (function (j1, window) {
       to
         {% if forloop.last %}'data_loaded'{% else %}'data_loaded'{% endif %}){% if forloop.last %}{% else %},{% endif %}
       -------------------------------------------------------------------------- {% endcomment %}
-      $.when (
       {% for item in nav_mmenu_options.menus %} {% if item.menu.enabled %}
       {% assign menu_id       = item.menu.xhr_container_id %}
       {% assign xhr_data_path = item.menu.xhr_data_path %}
 
-        j1.xhrData (
-          'j1.adapter.mmenu', {
-          xhr_container_id: '{{menu_id}}',
-          xhr_data_path:    '{{xhr_data_path}}' },
-          {% if forloop.last %}'null'{% else %}'null'{% endif %}){% if forloop.last %}{% else %},{% endif %}
+      j1.xhrData ({
+        xhr_container_id: '{{menu_id}}',
+        xhr_data_path:    '{{xhr_data_path}}'},
+        'j1.adapter.mmenu',
+        {% if forloop.last %}'data_loaded'{% else %}'null'{% endif %}){% if forloop.last %};{% else %};{% endif %}
 
       {% endif %}
       {% capture id_list %}{{id_list}}{{menu_id}}{% if forloop.last %}{% else %},{% endif %} {% endcapture %}
       {% endfor %} // ENDFOR menus
-      ).done (function ({{id_list}}) {
+
         // ---------------------------------------------------------------------
         // Initialize MMenu Navs and Drawers
         // ---------------------------------------------------------------------
-        // Make sure that Load HTML data (AJAX) is finished
-        setTimeout (function() {
-          _this.setState('data_loaded');
-        }, 300);
-
-        var dependencies_met_mmenu_initialized = setInterval (function () {
-          if (_this.getState() === 'data_loaded') {
+        var dependencies_met_all_menu_loaded = setInterval (function () {
+          if (j1.xhrDataState['#navigator_nav_mmenu'] == 'success' && j1.xhrDataState['#navigator_sidebar_mmenu'] == 'success' && j1.xhrDataState['#navigator_toc_mmenu'] == 'success') {
             logger.info('load HTML data (AJAX): finished');
             _this.setState('processing');
             logger.info('status: ' + _this.getState());
             logger.info('initialize navs and drawers');
-            j1.adapter.mmenu.mmenuInitializer(mmOptions);
-            clearInterval(dependencies_met_mmenu_initialized);
-          }
-        }, 25); // END dependencies_met_mmenu_loaded
+            _this.mmenuInitializer(mmOptions);
 
-        var dependencies_met_all_menu_loaded = setInterval (function () {
-          if ( $('#menu_mmenu').length && $('#sidebar_mmenu').length && $('#toc_mmenu').length ) {
             _this.setState('finished');
-            logger.info('status: ' + _this.getState());
+            logger.info('state: ' + _this.getState());
+            logger.info('module initialized successfully');
+            logger.info('met dependencies for: xhrData');
             clearInterval(dependencies_met_all_menu_loaded);
           }
         }, 25); // END dependencies_met_all_menu_loaded
-      }); // END done
     }, // END dataLoader
 
     // -------------------------------------------------------------------------
@@ -339,6 +313,14 @@ j1.adapter['mmenu'] = (function (j1, window) {
                 drawer_{{menu_id}}.open();
               });
             });
+
+            // load themes from Bootswatch API (set localFeed EMPTY)
+            $('#ThemeList_MMenu').bootstrapThemeSwitcher({
+                localFeed: ''
+            });
+            // load (local) J1 themes (default settings)
+            $('#ThemeSelect_MMenu').bootstrapThemeSwitcher();
+            logger.info('met dependencies for: {{menu_id}} loaded');
             clearInterval(dependencies_met_{{menu_id}}_loaded);
             $('#{{item.menu.content.id}}').show();
             logger.info('initializing mmenu finished on id: #{{menu_id}}');
@@ -354,7 +336,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
           // -------------------------------------------------------------------
           logger.info('initialize mmenu on id: #{{menu_id}}');
           var dependencies_met_{{menu_id}}_loaded = setInterval (function () {
-            if ({{menu_id}}) {
+            if ({{menu_id}} && $('{{item.menu.content.button}}').length) {
               const menu_selector = document.querySelector('#{{menu_id}}');
 
               const mmenu_{{menu_id}} = new MmenuLight (
@@ -400,6 +382,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                   } // END if hasclass
                 });
               });
+              logger.info('met dependencies for: {{menu_id}} loaded');
               clearInterval(dependencies_met_{{menu_id}}_loaded);
               $('#{{item.menu.content.id}}').show();
           }; // END if menu_loaded
@@ -443,20 +426,20 @@ j1.adapter['mmenu'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.mmenu.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.mmenu.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);