j1-template 2020.0.15 → 2020.0.20

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

@@ -83,7 +83,7 @@ j1.adapter['ssm'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  const isMobile    = j1.core.isMobile();
+  var isMobile      = j1.core.isMobile();
   var environment   = '{{environment}}';
   var dclFinished   = false;
   var moduleOptions = {};
@@ -97,7 +97,6 @@ j1.adapter['ssm'] = (function (j1, window) {
   var logger;
   var logText;
 
-
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
@@ -158,30 +157,13 @@ j1.adapter['ssm'] = (function (j1, window) {
       //
       _this['moduleOptions'] = moduleOptions;
 
-      // 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.core.ssm.init (moduleOptions);
-          _this.ssmLoader(moduleOptions);
-          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');
-          // j1.core.ssm.init (moduleOptions);
+        if (j1.adapter.navigator.getState() == 'finished') {
+          logger.info('met dependencies for: navigator');
           _this.ssmLoader(moduleOptions);
           clearInterval(dependencies_met_navigator);
         }
       }, 25);
-
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -204,7 +186,8 @@ j1.adapter['ssm'] = (function (j1, window) {
         xhr_container_id: '{{ssm_options.xhr_container_id}}',
         xhr_data_path:    '{{ssm_options.xhr_data_path}}' },
         'j1.adapter.ssm',
-        'data_loaded');
+        'data_loaded'
+      );
 
       // ---------------------------------------------------------------------
       // Initialize MMenu Navs and Drawers
@@ -218,11 +201,11 @@ j1.adapter['ssm'] = (function (j1, window) {
           if(isToc) {
             logger.info('found toc in page: enabled');
             if ( j1.adapter.toccer.getState() == 'finished' ) {
-              logger.info('dependency met for module : toccer');
+              logger.info('met dependencies for: toccer');
               _this.setState('processing');
               logger.info('set module state to: ' + _this.getState());
               logger.info('initialize ssm menu');
-              (ssmOptions.mode === 'icon')
+              ssmOptions.mode === 'icon'
                 ? logger.info('ssm mode detected: icon')
                 : logger.info('ssm mode detected: menu');
               _this.scrollSpy(ssmOptions);
@@ -231,6 +214,7 @@ j1.adapter['ssm'] = (function (j1, window) {
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
               logger.info('module initialized successfully');
+              logger.info('met dependencies for: xhrData');
               clearInterval(dependencies_met_mmenu_initialized);
             }
           } else {
@@ -241,6 +225,7 @@ j1.adapter['ssm'] = (function (j1, window) {
             $('#ssm_next_section').closest('.ssm-btn').hide();
             _this.scrollSpy(ssmOptions);
             _this.buttonInitializer(ssmOptions);
+            logger.info('met dependencies for: xhrData');
             clearInterval(dependencies_met_mmenu_initialized);
           }
         }
@@ -323,7 +308,7 @@ j1.adapter['ssm'] = (function (j1, window) {
       // Correction if mobile (offset: desktop -90px, mobile -80px)
       scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
 
-      nodes.each(function() {
+      nodes.each(function () {
         currentNode = $(this).find(current_header_id);
         if (currentNode.length) {
           if (index > maxNode) {
@@ -366,7 +351,7 @@ j1.adapter['ssm'] = (function (j1, window) {
       // Correction if mobile (offset: desktop -90px, mobile -80px)
       scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
 
-      nodes.each(function() {
+      nodes.each(function () {
         currentNode = $(this).find(current_header_id);
         if (currentNode.length) {
           if (index == maxNode) {
@@ -386,7 +371,7 @@ j1.adapter['ssm'] = (function (j1, window) {
             });
           }
         }
-        (index < maxNode) ? index++ : index;
+        index < maxNode ? index++ : index;
       });
     }, // END scroll_next_section
 
@@ -505,7 +490,7 @@ j1.adapter['ssm'] = (function (j1, window) {
 
         // show|hide ssm container on scroll position in page
         //
-        ( scrollPos >= showSsmPos ) && ( scrollPos <= hideSsmPos )
+        scrollPos >= showSsmPos && scrollPos <= hideSsmPos
           ? $ssmContainer.css('display','block')
           : $ssmContainer.css('display','none');
 
@@ -534,6 +519,22 @@ j1.adapter['ssm'] = (function (j1, window) {
   }; // END return
 })(j1, window);
 
+{% comment %} process adapter COMPRESSED for production DISABLED
+NOTE: for unknown reason, minifyJS detect JS/ES6 code
+      SyntaxError: Unexpected token: punc ())
+--------------------------------------------------------------------------------
+{% assign production = true %}
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} process adapter UNCOMPRESSED
+-------------------------------------------------------------------------------- {% endcomment %}
 {% endcapture %}
 {{ cache | strip_empty_lines }}
 {% assign cache = nil %}

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

@@ -83,8 +83,8 @@ regenerate: true
  # For details, see https://github.com/jguadagno/bootstrapThemethemer/blob/master/LICENSE
  # -----------------------------------------------------------------------------
  # NOTE:
- #  Setup of theme selectors (ThemeList|ThemeSelect) moved
- #  to j1_adapter_navigator.js
+ #  Setup of theme loaders for local_themes|remote_themes moved
+ #  to adapter navigator.js
  # -----------------------------------------------------------------------------
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
@@ -222,7 +222,7 @@ j1.adapter['themer'] = (function (j1, window) {
       if (themeName === 'Uno') {
         $('head link[href*="' +themeExtensionCss+ '"]').remove();
       } else {
-        $('head').append(themeExtensionCssHtml);
+        // $('head').append(themeExtensionCssHtml);
       }
 
       {% if themer_options.enabled %}
@@ -230,10 +230,11 @@ j1.adapter['themer'] = (function (j1, window) {
         logger.info('theme is being initialized: ' + themeName);
 
       var dependencies_met_navigator_started = setInterval (function () {
-        if (j1.adapter.navigator.getState() == 'started') {
+        // if (j1.adapter.navigator.getState() == 'started') {
+        if ( $('#remote_themes').length ) {
           /* eslint-disable */
           // initialize Bootswatch Theme Switcher
-          $('#ThemeList').bootstrapThemeSwitcher.defaults = {
+          $('#remote_themes').bootstrapThemeSwitcher.defaults = {
             debug:                    {{themer_options.debug|json}},
             saveToCookie:             {{themer_options.saveToCookie|json}},
             cssThemeLink:             {{themer_options.cssThemeLink|json}},
@@ -267,6 +268,7 @@ j1.adapter['themer'] = (function (j1, window) {
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
           logger.info('module initialized successfully');
+          logger.info('met dependencies for: navigator');
           clearInterval(dependencies_met_navigator_started);
         }
       }, 25); // END 'dependencies_met_navigator_started'
@@ -277,14 +279,6 @@ j1.adapter['themer'] = (function (j1, window) {
       {% endif %}
     }, // END init
 
-    // -------------------------------------------------------------------------
-    // setCss
-    // Set dynamic styles
-    // -------------------------------------------------------------------------
-    setCss: function () {
-      var bg_primary                      = j1.getStyleValue('bg-primary', 'background-color');
-    }, // END setCss
-
     // -------------------------------------------------------------------------
     // messageHandler
     // Manage messages send from other J1 modules

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

@@ -142,15 +142,44 @@ j1.adapter['toccer'] = (function () {
         settings.enabled = true;
       }
 
+      // save config settings into the toccer object for global|later access
+      //
+      _this['moduleOptions'] = settings;
+
       if (isToc) {
-        _this.initToccerCore(settings);
-        // set state finished if tocbot has created the toc
-        var dependencies_met_toccer_initialized = setInterval (function () {
-          if ($('ol.toc-list ').length) {
+        var dependencies_met_navigator = setInterval(function() {
+//        if ( j1.adapter.navigator.getState() == 'finished' ) {
+          if ( j1.getState() == 'finished' ) {
+            var settings = j1.adapter.toccer.moduleOptions;
+
+            // calculate (tocbot page) offset DYMICALLY for correct
+            // smoothscroll position
+            //
+            var $pagehead       = $('.attic');
+            var $navbar         = $('nav.navbar');
+            var $adblock        = $('#adblock');
+
+            var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+            var fontSize        = $('body').css('font-size').replace('px','');
+            var start           = window.pageYOffset;
+
+            var l               = parseInt(fontSize);
+
+            var h               = $pagehead.length ? $pagehead.height() : 0;
+            var n               = $navbar.length ? $navbar.height() : 0;
+            var a               = $adblock.length ? $adblock.height() : 0;
+
+            var o               = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+            settings.scrollSmoothOffset = o;
+
+            _this.initToccerCore(settings);
+
             _this.setState('finished');
             logger.info('state: ' + _this.getState());
             logger.info('module initialized successfully');
-            clearInterval(dependencies_met_toccer_initialized);
+            logger.info('met dependencies for: j1');
+            clearInterval(dependencies_met_navigator);
           }
         }, 25);
       }
@@ -198,11 +227,12 @@ j1.adapter['toccer'] = (function () {
             fixedSidebarOffset:     'auto',
             scrollSmooth:           {{ toccer_options.scrollSmooth | json }},
             scrollSmoothDuration:   {{ toccer_options.scrollSmoothDuration | json }},
-            scrollSmoothOffset:     {{ toccer_options.scrollSmoothOffset | json }},
+            scrollSmoothOffset:     settings.scrollSmoothOffset,
             headingsOffset:         1,
             throttleTimeout:        {{ toccer_options.throttleTimeout | json }}
           });
           /* eslint-enable */
+          logger.info('met dependencies for: xhrData');
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished

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

@@ -1,3 +1,20 @@
+/*
+// -----------------------------------------------------------------------------
+// ~/packages/100_template_css/animate.scss
+// CSS index file for AnimateCSS
+//
+// Product/Info:
+// https://jekyll.one
+//
+// Copyright (C) 2020 Juergen Adams
+// Copyright (C) 2020 Daniel Eden and Contributors
+//
+// J1 Template is licensed under the MIT License.
+// See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+// Animate.css is licensed under the MIT license
+// See: https://opensource.org/licenses/MIT
+// -----------------------------------------------------------------------------
+*/
 /*
  # -----------------------------------------------------------------------------
  # ~/vendor/animate/animate.scss

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

@@ -1,8 +1,22 @@
+/*
+// -----------------------------------------------------------------------------
+//   ~/packages/100_template_css/theme_bootstrap.scss
+//   Default Bootstrap V4 Theme - MAIN INDEX file
+//
+//   Product/Info:
+//   https://jekyll.one
+//
+//   Copyright (C) 2020 Juergen Adams
+//
+//   J1 Template is licensed under the MIT License.
+//   See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+// -----------------------------------------------------------------------------
+*/
 /*!
- * Bootstrap v4.5.0 (https://getbootstrap.com/)
+ * Bootstrap v4.5.2 (https://getbootstrap.com/)
  * Copyright 2011-2020 The Bootstrap Authors
  * Copyright 2011-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root {
   --blue: #007bff;
@@ -137,10 +151,10 @@ a {
     color: #0056b3;
     text-decoration: underline; }
 
-a:not([href]) {
+a:not([href]):not([class]) {
   color: inherit;
   text-decoration: none; }
-  a:not([href]):hover {
+  a:not([href]):not([class]):hover {
     color: inherit;
     text-decoration: none; }
 
@@ -438,26 +452,12 @@ pre {
   max-height: 340px;
   overflow-y: scroll; }
 
-.container {
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto; }
-  @media (min-width: 576px) {
-    .container {
-      max-width: 540px; } }
-  @media (min-width: 768px) {
-    .container {
-      max-width: 720px; } }
-  @media (min-width: 992px) {
-    .container {
-      max-width: 960px; } }
-  @media (min-width: 1200px) {
-    .container {
-      max-width: 1140px; } }
-
-.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
+.container,
+.container-fluid,
+.container-sm,
+.container-md,
+.container-lg,
+.container-xl {
   width: 100%;
   padding-right: 15px;
   padding-left: 15px;
@@ -508,7 +508,6 @@ pre {
 .col {
   flex-basis: 0;
   flex-grow: 1;
-  min-width: 0;
   max-width: 100%; }
 
 .row-cols-1 > * {
@@ -670,7 +669,6 @@ pre {
   .col-sm {
     flex-basis: 0;
     flex-grow: 1;
-    min-width: 0;
     max-width: 100%; }
   .row-cols-sm-1 > * {
     flex: 0 0 100%;
@@ -789,7 +787,6 @@ pre {
   .col-md {
     flex-basis: 0;
     flex-grow: 1;
-    min-width: 0;
     max-width: 100%; }
   .row-cols-md-1 > * {
     flex: 0 0 100%;
@@ -908,7 +905,6 @@ pre {
   .col-lg {
     flex-basis: 0;
     flex-grow: 1;
-    min-width: 0;
     max-width: 100%; }
   .row-cols-lg-1 > * {
     flex: 0 0 100%;
@@ -1027,7 +1023,6 @@ pre {
   .col-xl {
     flex-basis: 0;
     flex-grow: 1;
-    min-width: 0;
     max-width: 100%; }
   .row-cols-xl-1 > * {
     flex: 0 0 100%;
@@ -1558,6 +1553,7 @@ textarea.form-control {
 .valid-tooltip {
   position: absolute;
   top: 100%;
+  left: 0;
   z-index: 5;
   display: none;
   max-width: 100%;
@@ -1638,6 +1634,7 @@ textarea.form-control {
 .invalid-tooltip {
   position: absolute;
   top: 100%;
+  left: 0;
   z-index: 5;
   display: none;
   max-width: 100%;
@@ -2657,6 +2654,7 @@ input[type="button"].btn-block {
 
 .custom-control {
   position: relative;
+  z-index: 1;
   display: block;
   min-height: 1.5rem;
   padding-left: 1.5rem; }
@@ -3029,10 +3027,12 @@ input[type="button"].btn-block {
   color: #fff;
   background-color: #007bff; }
 
+.nav-fill > .nav-link,
 .nav-fill .nav-item {
   flex: 1 1 auto;
   text-align: center; }
 
+.nav-justified > .nav-link,
 .nav-justified .nav-item {
   flex-basis: 0;
   flex-grow: 1;
@@ -3326,6 +3326,9 @@ input[type="button"].btn-block {
       border-bottom-width: 0;
       border-bottom-right-radius: calc(0.25rem - 1px);
       border-bottom-left-radius: calc(0.25rem - 1px); }
+  .card > .card-header + .list-group,
+  .card > .list-group + .card-footer {
+    border-top: 0; }
 
 .card-body {
   flex: 1 1 auto;
@@ -3355,8 +3358,6 @@ input[type="button"].btn-block {
   border-bottom: 1px solid rgba(0, 0, 0, 0.125); }
   .card-header:first-child {
     border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; }
-  .card-header + .list-group .list-group-item:first-child {
-    border-top: 0; }
 
 .card-footer {
   padding: 0.75rem 1.25rem;
@@ -3381,7 +3382,8 @@ input[type="button"].btn-block {
   right: 0;
   bottom: 0;
   left: 0;
-  padding: 1.25rem; }
+  padding: 1.25rem;
+  border-radius: calc(0.25rem - 1px); }
 
 .card-img,
 .card-img-top,
@@ -3459,18 +3461,20 @@ input[type="button"].btn-block {
       display: inline-block;
       width: 100%; } }
 
-.accordion > .card {
-  overflow: hidden; }
-  .accordion > .card:not(:last-of-type) {
-    border-bottom: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0; }
-  .accordion > .card:not(:first-of-type) {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0; }
-  .accordion > .card > .card-header {
-    border-radius: 0;
-    margin-bottom: -1px; }
+.accordion {
+  overflow-anchor: none; }
+  .accordion > .card {
+    overflow: hidden; }
+    .accordion > .card:not(:last-of-type) {
+      border-bottom: 0;
+      border-bottom-right-radius: 0;
+      border-bottom-left-radius: 0; }
+    .accordion > .card:not(:first-of-type) {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0; }
+    .accordion > .card > .card-header {
+      border-radius: 0;
+      margin-bottom: -1px; }
 
 .breadcrumb {
   display: flex;
@@ -4087,14 +4091,13 @@ a.close.disabled {
   pointer-events: none; }
 
 .toast {
+  flex-basis: 350px;
   max-width: 350px;
-  overflow: hidden;
   font-size: 0.875rem;
   background-color: rgba(255, 255, 255, 0.85);
   background-clip: padding-box;
   border: 1px solid rgba(0, 0, 0, 0.1);
   box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
-  backdrop-filter: blur(10px);
   opacity: 0;
   border-radius: 0.25rem; }
   .toast:not(:last-child) {
@@ -4114,7 +4117,9 @@ a.close.disabled {
   color: #6c757d;
   background-color: rgba(255, 255, 255, 0.85);
   background-clip: padding-box;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05); }
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  border-top-left-radius: calc(0.25rem - 1px);
+  border-top-right-radius: calc(0.25rem - 1px); }
 
 .toast-body {
   padding: 0.75rem; }
@@ -7092,7 +7097,8 @@ a.text-dark:hover, a.text-dark:focus {
   text-decoration: none !important; }
 
 .text-break {
-  word-wrap: break-word !important; }
+  word-break: break-word !important;
+  overflow-wrap: break-word !important; }
 
 .text-reset {
   color: inherit !important; }