j1-template 2021.0.0 → 2021.0.5

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -58,7 +58,7 @@ regenerate:                             true
  # https://jekyll.one
  # https://github.com/miromannino/Justified-Gallery
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2016 Miro Mannino
  #
  # J1 Template is licensed under the MIT License.

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -61,7 +61,7 @@ regenerate:                             false
  # https://jekyll.one
  # https://github.com/lokesh/lightbox2/
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2007, 2018 Lokesh Dhakar
  #
  # J1 Template is licensed under the MIT License.

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -61,7 +61,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one

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

@@ -12,7 +12,7 @@ regenerate: true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -80,7 +80,7 @@ regenerate: true
  # Product/Info:
  # {{site.data.template_settings.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.template_settings.theme_author_url}}
@@ -223,24 +223,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
       {% capture id_list %}{{id_list}}{{menu_id}}{% if forloop.last %}{% else %},{% endif %} {% endcapture %}
       {% endfor %} // ENDFOR menus
 
-        // ---------------------------------------------------------------------
-        // Initialize MMenu Navs and Drawers
-        // ---------------------------------------------------------------------
-        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');
-            _this.mmenuInitializer(mmOptions);
-
-            _this.setState('finished');
-            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
+      logger.info('initialize navs and drawers');
+      _this.mmenuInitializer(mmOptions);
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initialized successfully');
+
     }, // END dataLoader
 
     // -------------------------------------------------------------------------
@@ -267,9 +255,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         // menu initializer (NAVIGATION)
         // ---------------------------------------------------------------------
+        // NOTE: Run load check (j1.xhrDataState) before initialization
+        //
         logger.info('initialize mmenu on id: #{{menu_id}}');
         var dependencies_met_{{menu_id}}_loaded = setInterval (function () {
-          if ({{menu_id}}) {
+          if (j1.xhrDataState['#{{menu_id}}'] == 'success' ) {
+            logger.info('met dependencies for: xhrData/{{menu_id}}');
             const menu_selector = document.querySelector('#{{menu_id}}');
             const mmenu_{{menu_id}} = new MmenuLight (
               menu_selector,
@@ -318,11 +309,13 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
 
-            // jadams, 2020-09-30: loading the menues (themes)
-            // from Bootswatch API (set localFeed EMPTY)
-            $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-            // load (local) J1 themes (default settings) from JSON data
-            $('#local_themes_mmenu').bootstrapThemeSwitcher();
+            // jadams, 2020-09-30: loading the menues (themes) if enabled
+            if (themerEnabled) {
+              // from Bootswatch API (set localFeed EMPTY)
+              $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
+              // load (local) J1 themes (default settings) from JSON data
+              $('#local_themes_mmenu').bootstrapThemeSwitcher();
+            }
 
             $('#{{item.menu.content.id}}').show();
             logger.info('initializing mmenu finished on id: #{{menu_id}}');
@@ -340,11 +333,16 @@ j1.adapter['mmenu'] = (function (j1, window) {
           // -------------------------------------------------------------------
           // menu initializer (DRAWER)
           // -------------------------------------------------------------------
+          // TODO: Check if Toggle button make sense/should be implemented
+          // NOTE: Run load check (j1.xhrDataState) before initialization
+          //
           logger.info('initialize mmenu on id: #{{menu_id}}');
           var dependencies_met_{{menu_id}}_loaded = setInterval (function () {
-            if ({{menu_id}} && $('{{item.menu.content.button}}').length) {
-              const menu_selector = document.querySelector('#{{menu_id}}');
+            if (j1.xhrDataState['#{{menu_id}}'] == 'success' &&
+                $('{{item.menu.content.button}}').length) {
+              logger.info('met dependencies for: xhrData/{{menu_id}}');
 
+              const menu_selector = document.querySelector('#{{menu_id}}');
               const mmenu_{{menu_id}} = new MmenuLight (
                 menu_selector,
                 '(max-width: ' + mmOptions.mmenu_plugin.max_width +'px)', {
@@ -367,7 +365,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                   var hasClass;
 
                   // check if the button should be activated
-                  // e.g for TOC only if clas js-toc-content is found
+                  // e.g for TOC only if class js-toc-content is found
                   //
                   if ('{{item.menu.content.button_activated}}' != 'always') {
                     hasClass = $('main').hasClass('{{item.menu.content.button_activated}}');

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -127,7 +127,7 @@ ToDo: Remove configuration from j1_navigator.yml
  # Product/Info:
  # {{site.data.template_settings.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.template_settings.theme_author_url}}
@@ -415,7 +415,6 @@ j1.adapter['navigator'] = (function (j1, window) {
               _this.initAuthClient(_this.navAuthManagerConfig);
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
-              logger.info('met dependencies for: themer');
               clearInterval(dependencies_met_themer_finished);
             }
           }, 25); // END 'dependencies_met_themer_finished'

data/assets/themes/j1/adapter/js/{lunr_search.js → quicksearch.js}

@@ -6,12 +6,12 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lunr_search.js
- # Liquid template to adapt J1LunrSearch
+ # ~/assets/themes/j1/adapter/js/quicksearch.js
+ # Liquid template to adapt Lunr for J1 TemplATE
  #
  # Product/Info:
  # https://jekyll.one
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -38,12 +38,12 @@ regenerate:                             true
 {% assign environment           = site.environment %}
 {% assign template_version      = site.version %}
 
-{% assign lunr_search_defaults  = modules.defaults.lunr_search.defaults %}
-{% assign lunr_search_settings  = modules.lunr_search.settings %}
+{% assign quicksearch_defaults  = modules.defaults.quicksearch.defaults %}
+{% assign quicksearch_settings  = modules.quicksearch.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign lunr_search_options   = lunr_search_defaults | merge: lunr_search_settings %}
+{% assign lunr_search_options   = quicksearch_defaults | merge: quicksearch_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -52,13 +52,13 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lunr_search.js
- # J1 Adapter for lunr_search
+ # ~/assets/themes/j1/adapter/js/quicksearch.js
+ # J1 Adapter for J1 QuickSearch (Lunr)
  #
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -76,7 +76,7 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['lunr_search'] = (function (j1, window) {
+j1.adapter['quicksearch'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -103,8 +103,8 @@ j1.adapter['lunr_search'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this   = j1.adapter.lunr_search;
-      logger  = log4javascript.getLogger('j1.adapter.lunr_search');
+      _this   = j1.adapter.quicksearch;
+      logger  = log4javascript.getLogger('j1.adapter.quicksearch');
 
       // initialize state flag
       _this.setState('started');
@@ -115,7 +115,7 @@ j1.adapter['lunr_search'] = (function (j1, window) {
       // defaults
       // -----------------------------------------------------------------------
       var settings = $.extend({
-        module_name: 'j1.adapter.lunr_search',
+        module_name: 'j1.adapter.quicksearch',
         generated:   '{{site.time}}'
       }, options);
 

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

@@ -11,7 +11,7 @@ regenerate:                             false
  #
  # Product/Info:
  # https://jekyll.one
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -45,21 +45,23 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
+ # Note:
+ #  https://github.com/jirutka/asciidoctor-rouge/issues/9
+ # -----------------------------------------------------------------------------
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 
-// https://github.com/jirutka/asciidoctor-rouge/issues/9
-
 // -----------------------------------------------------------------------------
 // ESLint shimming
 // -----------------------------------------------------------------------------
 /* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
 
@@ -155,9 +157,9 @@ j1.adapter['rouge'] = (function (j1, window) {
       var dependencies_met_rouge_theme_loaded = setInterval (function () {
         if (j1.adapter.rouge.getState() === 'finished') {
           if ( darkTheme ) {
-            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_dark)
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_dark);
           } else {
-            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_light)
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_light);
           }
           clearInterval(dependencies_met_rouge_theme_loaded);
         }

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

@@ -11,7 +11,7 @@ regenerate:                             false
  #
  # Product/Info:
  # https://jekyll.one
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -29,7 +29,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -109,7 +109,7 @@ j1.adapter['rtable'] = (function (j1, window) {
           // table doesn't stretch full page width
           //$(curTable).addClass('table-responsive')
           // jadams, 2020-09-16: add needed CSS class/attribute for tablesaw
-          $(curTable).addClass('tablesaw')
+          $(curTable).addClass('tablesaw');
           $(curTable).attr('data-tablesaw-mode','stack');
         }
       });

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -72,7 +72,7 @@ regenerate:                             false
  # https://jekyll.one
  # https://github.com/jguadagno/bootstrapThemeSwitcher
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2014 Joseph Guadagno
  #
  # J1 Template is licensed under the MIT License.
@@ -92,7 +92,9 @@ regenerate:                             false
 // ESLint shimming
 // -----------------------------------------------------------------------------
 /* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
+
 'use strict';
 
 j1.adapter['themer'] = (function (j1, window) {
@@ -179,57 +181,63 @@ j1.adapter['themer'] = (function (j1, window) {
         $('head').append(theme_css_html);
       }
 
+      // store if theme_switcher is enabled
+      //
+      user_state.theme_switcher = themerOptions.enabled;
+
       j1.writeCookie({
         name: cookie_user_state_name,
         data: user_state
       });
 
-      {% if themer_options.enabled %}
-        // enable BS ThemeSwitcher
-        logger.info('themes detected as: enabled');
-        logger.info('theme is being initialized: ' + user_state.theme_name);
-
-      var dependencies_met_navigator_started = setInterval (function () {
-        // if (j1.adapter.navigator.getState() == 'started') {
-        if ( $('#remote_themes').length ) {
-          /* eslint-disable */
-          // initialize Bootswatch Theme Switcher
-          $('#remote_themes').bootstrapThemeSwitcher.defaults = {
-            debug:                    themerOptions.debug,
-            saveToCookie:             themerOptions.saveToCookie,
-            cssThemeLink:             themerOptions.cssThemeLink,
-            cookieThemeName:          themerOptions.cookieThemeName,
-            cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
-            cookieThemeCss:           themerOptions.cookieThemeCss,
-            cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
-            cookieExpiration:         themerOptions.cookieExpiration,
-            cookiePath:               themerOptions.cookiePath,
-            defaultCssFile:           themerOptions.defaultCssFile,
-            bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
-            bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
-            loadFromBootswatch:       themerOptions.loadFromBootswatch,
-            localFeed:                themerOptions.localThemes,
-            excludeBootswatch:        themerOptions.excludeBootswatch,
-            includeBootswatch:        themerOptions.includeBootswatch,
-            skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
+      // jadams, 2021-01-03: dependency has to be checked in more detail
+      //
+      var dependencies_met_j1_finished = setInterval (function () {
+        if (j1.getState() == 'finished') {
+          if (themerOptions.enabled) {
+            // enable BS ThemeSwitcher
+            logger.info('themes detected as: enabled');
+            logger.info('theme is being initialized: ' + user_state.theme_name);
+
+            if ( $('#remote_themes').length ) {
+              /* eslint-disable */
+              // initialize Bootswatch Theme Switcher
+              $('#remote_themes').bootstrapThemeSwitcher.defaults = {
+                debug:                    themerOptions.debug,
+                saveToCookie:             themerOptions.saveToCookie,
+                cssThemeLink:             themerOptions.cssThemeLink,
+                cookieThemeName:          themerOptions.cookieThemeName,
+                cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
+                cookieThemeCss:           themerOptions.cookieThemeCss,
+                cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
+                cookieExpiration:         themerOptions.cookieExpiration,
+                cookiePath:               themerOptions.cookiePath,
+                defaultCssFile:           themerOptions.defaultCssFile,
+                bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
+                bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
+                loadFromBootswatch:       themerOptions.loadFromBootswatch,
+                localFeed:                themerOptions.localThemes,
+                excludeBootswatch:        themerOptions.excludeBootswatch,
+                includeBootswatch:        themerOptions.includeBootswatch,
+                skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
+              }
+              /* eslint-enable */
+
+              logger.info('theme loaded: ' + user_state.theme_name);
+              logger.info('theme css file: ' + user_state.theme_css);
+              _this.setState('finished');
+              logger.info('state: ' + _this.getState());
+              logger.info('module initialized successfully');
+              logger.info('met dependencies for: navigator');
+            }
+          } else {
+            _this.setState('finished');
+            logger.info('state: ' + _this.getState());
+            logger.info('themes detected as: disabled');
           }
-          /* eslint-enable */
-
-          logger.info('theme loaded: ' + user_state.theme_name);
-          logger.info('theme css file: ' + user_state.theme_css);
-
-          _this.setState('finished');
-          logger.info('state: ' + _this.getState());
-          logger.info('module initialized successfully');
-          logger.info('met dependencies for: navigator');
-          clearInterval(dependencies_met_navigator_started);
+          clearInterval(dependencies_met_j1_finished);
         }
-      }, 25); // END 'dependencies_met_navigator_started'
-      {% else %}
-        _this.setState('finished');
-        logger.info('state: ' + _this.getState());
-        logger.info('themes detected as: disabled');
-      {% endif %}
+      }, 25); // END 'dependencies_met_j1_finished'
     }, // END init
 
     // -------------------------------------------------------------------------