j1-template 2020.0.22 → 2021.0.2

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}}
@@ -318,11 +318,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}}');

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/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
@@ -105,9 +105,11 @@ j1.adapter['rtable'] = (function (j1, window) {
         // jadams, 2020-09-16: class 'rtable' indicate use of 'tablesaw'
         if ($(curTable).hasClass('rtable')) {
           // jadams, 2020-09-17: add BS responsive class in case of an overflow
-          $(curTable).addClass('table-responsive')
+          // jadams, 2020-11-21: BS responsive class disabled, bcause the
+          // 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
 
     // -------------------------------------------------------------------------

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

@@ -13,7 +13,7 @@ regenerate:                             true
  # https://jekyll.one
  # https://tscanlin.github.io/tocbot
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -73,7 +73,7 @@ regenerate:                             true
  # https://jekyll.one
  # https://tscanlin.github.io/tocbot
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -97,8 +97,10 @@ j1.adapter['toccer'] = (function () {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}'; // Set environment
-  var moduleOptions = {};
+  var environment         = '{{environment}}';                                  // Set environment
+  var moduleOptions       = {};
+  var toccerOptions       = {};
+  var frontmatterOptions  = {};
   var _this;
   var logger;
   var logText;
@@ -128,31 +130,60 @@ j1.adapter['toccer'] = (function () {
       logger.info('state: ' + _this.getState());
       logger.info('Module is being initialized');
 
-      if (options  !== undefined) {
-        var settings = $.extend({}, options);
-      } else {
-        var settings = false;
-      }
+      // create settings object from frontmatterOptions
+      var frontmatterOptions = options != null ? $.extend({}, options) : {};
 
-      // cast text-based booleans
-      var  isToc = (options.toc === 'true');
-      var  isComments = (options.comments === 'true');
+      // -----------------------------------------------------------------------
+      // defaults
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.toccer',
+        generated:   '{{site.time}}'
+      }, options);
 
-      if (settings.collapseDepth === undefined) {
-        settings.collapseDepth = {{toccer_options.collapseDepth}};
-      }
+      // -----------------------------------------------------------------------
+      // options loader
+      // -----------------------------------------------------------------------
+      /* eslint-disable */
+      toccerOptions = $.extend({}, {{toccer_options | replace: 'nil', 'null' | replace: '=>', ':' }});
+
+      // Load (individual) frontmatter options (currently NOT used)
+      if (options != null) { frontmatterOptions = $.extend({}, options); }
 
-      if (settings.scrollSmoothOffset === undefined) {
-        settings.scrollSmoothOffset = {{toccer_options.scrollSmoothOffset}};
+      if (typeof frontmatterOptions !== 'undefined') {
+        moduleOptions = j1.mergeData(frontmatterOptions, toccerOptions);
       }
+      /* eslint-enable */
+
+      // save config settings into the toccer object for global access
+      //
+      _this['moduleOptions'] = moduleOptions;
+
+      // if (options  !== undefined) {
+      //   var settings = $.extend({}, options);
+      // } else {
+      //   var settings = false;
+      // }
 
-      if (settings.enabled === undefined) {
-        settings.enabled = true;
+      // cast text-based booleans
+      var  isToc = (moduleOptions.toc === 'true');
+      var  isComments = (moduleOptions.comments === 'true');
+
+      if (moduleOptions.collapseDepth === undefined) {
+        moduleOptions.collapseDepth = 3;
       }
 
+      // if (settings.scrollSmoothOffset === undefined) {
+      //   settings.scrollSmoothOffset = {{toccer_options.scrollSmoothOffset}};
+      // }
+      //
+      // if (settings.enabled === undefined) {
+      //   settings.enabled = true;
+      // }
+
       // save config settings into the toccer object for global|later access
       //
-      _this['moduleOptions'] = settings;
+      // _this['moduleOptions'] = settings;
 
       if (isToc) {
         var dependencies_met_navigator = setInterval(function() {
@@ -212,14 +243,14 @@ j1.adapter['toccer'] = (function () {
         if ($('#toc_mmenu').length) {
           /* eslint-disable */
           tocbot.init({
-            log:                    {{ toccer_options.log | json }},
-            activeLinkColor:        {{ toccer_options.activeLinkColor | json }},
-            tocSelector:            {{ toccer_options.tocSelector | json }},
-            headingSelector:        {{ toccer_options.headingSelector | json }},
-            ignoreSelector:         {{ toccer_options.ignoreSelector | json }},
-            contentSelector:        {{ toccer_options.contentSelector | json }},
-            collapseDepth:          settings.collapseDepth,
-            throttleTimeout:        {{ toccer_options.throttleTimeout | json }},
+            log:                    moduleOptions.log,
+            activeLinkColor:        moduleOptions.activeLinkColor,
+            tocSelector:            moduleOptions.tocSelector,
+            headingSelector:        moduleOptions.headingSelector,
+            ignoreSelector:         moduleOptions.ignoreSelector,
+            contentSelector:        moduleOptions.contentSelector,
+            collapseDepth:          moduleOptions.collapseDepth,
+            throttleTimeout:        moduleOptions.throttleTimeout,
             hasInnerContainers:     false,
             includeHtml:            false,
             linkClass:              'toc-link',
@@ -233,11 +264,12 @@ j1.adapter['toccer'] = (function () {
             positionFixedSelector:  '',
             positionFixedClass:     'is-position-fixed',
             fixedSidebarOffset:     'auto',
-            scrollSmooth:           {{ toccer_options.scrollSmooth | json }},
-            scrollSmoothDuration:   {{ toccer_options.scrollSmoothDuration | json }},
-            scrollSmoothOffset:     settings.scrollSmoothOffset,
+            scrollContainer:        null,
+            scrollSmooth:           moduleOptions.scrollSmooth,
+            scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
+            scrollSmoothOffset:     moduleOptions.scrollSmoothOffset,
             headingsOffset:         1,
-            throttleTimeout:        {{ toccer_options.throttleTimeout | json }}
+            throttleTimeout:        moduleOptions.throttleTimeout
           });
           /* eslint-enable */
           logger.info('met dependencies for: xhrData');

data/assets/themes/j1/core/css/animate.css

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2020 Daniel Eden and Contributors
  #
  # J1 Template is licensed under the MIT License.
@@ -23,7 +23,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2020 Daniel Eden and Contributors
  #
  # J1 Template is licensed under the MIT License.

data/assets/themes/j1/core/css/icon-fonts/fontawesome.css

@@ -7,7 +7,7 @@
  # https://jekyll.one
  # http://fontawesome.io
  #
- # 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
@@ -26,7 +26,7 @@
  # https://jekyll.one
  # http://fontawesome.io
  #
- # 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