j1-template 2020.0.7 → 2020.0.12

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -45,6 +45,11 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign jekyll_search_options  = jekyll_search_defaults | merge: jekyll_search_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/searcher.js
@@ -65,6 +70,12 @@ regenerate:                             false
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -107,7 +118,9 @@ j1.adapter['searcher'] = (function (j1, window) {
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
+      /* eslint-disable */
       moduleOptions = $.extend({}, {{jekyll_search_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       if (typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData(moduleOptions, settings);
@@ -124,6 +137,7 @@ j1.adapter['searcher'] = (function (j1, window) {
           resultsContainer:     document.getElementById(moduleOptions.results_container),
           json:                 moduleOptions.index_data,
           searchResultTemplate: moduleOptions.result_template,
+          results_output:       moduleOptions.results_output,
           limit:                moduleOptions.result_limit,
           minSearchItemLen:     moduleOptions.min_search_item_len,
           fuzzy:                moduleOptions.search_fuzzy,
@@ -136,7 +150,7 @@ j1.adapter['searcher'] = (function (j1, window) {
       } else {
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
-        logger.info("module disabled");
+        logger.info('module disabled');
       }
 
       return true;
@@ -189,5 +203,9 @@ j1.adapter['searcher'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -20,6 +20,13 @@ regenerate:                             true
  # Test data:
  #  {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
+ # NOTE:
+ #  jadams, 2020-07-17:
+ #    J1 SSM can't be minfied for now. Uglifier fails on an ES6 (most probably)
+ #    structure that couldn't fixed by 'harmony' setting. Minifier fails by:
+ #    Unexpected token: punc ())
+ #    Current, minifying has been disabled
+ # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% comment %} Liquid var initialization
@@ -28,6 +35,7 @@ regenerate:                             true
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign site_config     = site %}
+{% assign environment     = site_config.environment %}
 {% assign template_config = site.data.template_settings %}
 {% assign modules         = site.data.modules %}
 
@@ -43,6 +51,11 @@ regenerate:                             true
 {% assign toccer_options  = toccer_defaults | merge: toccer_settings %}
 {% assign ssm_options     = ssm_defaults | merge: ssm_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/ssm.js
@@ -59,10 +72,15 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['ssm'] = (function (j1, window) {
-
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
@@ -78,12 +96,12 @@ j1.adapter['ssm'] = (function (j1, window) {
   var _this;
   var logger;
   var logText;
+  const isMobile = j1.core.isMobile();
 
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
 
-
   // ---------------------------------------------------------------------------
   // main object
   // ---------------------------------------------------------------------------
@@ -113,20 +131,22 @@ j1.adapter['ssm'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       _this         = j1.adapter.ssm;
       logger        = log4javascript.getLogger('j1.adapter.ssm');
-      sect12Nodes   = $("[class$='sect1'],[class$='sect2'");
-      sect1Nodes    = $("[class$='sect1']");
+      sect12Nodes   = $('[class$="sect1"],[class$="sect2"');
+      sect1Nodes    = $('[class$="sect1"]');
 
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
+      /* eslint-disable */
       var ssmMenuOptions = $.extend({}, {{nav_ssm_options | replace: '=>', ':' }});
       var ssmOptions = $.extend({}, {{ssm_options | replace: 'nil', 'null' | replace: '=>', ':' }});
+      /* eslint-enable */
       var xhr_data_path;
       var menu_id;
 
       // Load (individual) frontmatter options (currently NOT used)
       //
-      if (options != null) { var frontmatterOptions = $.extend({}, options) }
+      if (options != null) { var frontmatterOptions = $.extend({}, options); }
 
       if (typeof frontmatterOptions !== 'undefined') {
         moduleOptions = j1.mergeData(ssmOptions, frontmatterOptions);
@@ -137,7 +157,7 @@ j1.adapter['ssm'] = (function (j1, window) {
       j1.adapter.ssm['moduleOptions'] = moduleOptions;
 
       _this.setState('started');
-      logger.info('state: ' + _this.getState());
+      logger.info('set module state to: ' + _this.getState());
       logger.info('module is being initialized');
 
       // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
@@ -173,8 +193,11 @@ j1.adapter['ssm'] = (function (j1, window) {
       var menu_id;
       var xhr_data_path;
 
+      // cast text-based booleans
+      var isToc = (ssmOptions.toc === 'true');
+
       _this.setState('loading');
-      logger.info('status: ' + _this.getState());
+      logger.info('set module state to: ' + _this.getState());
       logger.info('load HTML data for ssm');
 
       {% assign id_list = "" %}
@@ -184,30 +207,42 @@ j1.adapter['ssm'] = (function (j1, window) {
         {% assign xhr_data_path = ssm_options.xhr_data_path %}
         j1.xhrData (
           'j1.adapter.ssm', {
-          xhr_container_id: "{{menu_id}}",
-          xhr_data_path:    "{{xhr_data_path}}" },
+          xhr_container_id: '{{menu_id}}',
+          xhr_data_path:    '{{xhr_data_path}}' },
           'data_loaded')
-      ).done (function (ssm) {
+      ).done (function (ssm_html_loaded) {
         // ---------------------------------------------------------------------
         // Initialize MMenu Navs and Drawers
         // ---------------------------------------------------------------------
         var dependencies_met_mmenu_initialized = setInterval (function () {
-          if (ssm) {
-           if (j1.getState() === 'finished') {
-//         if ( j1.adapter.navigator.getState() == 'finished' ) {
-              logger.info('load HTML data (AJAX): finished');
-              _this.setState('processing');
-              logger.info('status: ' + _this.getState());
-              logger.info('initialize ssm menu');
-              if ( ssmOptions.mode === 'icon') {
-                logger.info('icon mode detected');
+          if (ssm_html_loaded && $('#{{ssm_options.menu_id}}').length) {
+            _this.setState('loaded');
+            logger.info('set module state to: ' + _this.getState());
+            logger.info('HTML data for ssm: ' + _this.getState());
+            if(isToc) {
+              logger.info('found toc in page: enabled');
+              if ( j1.adapter.toccer.getState() == 'finished' ) {
+                logger.info('dependency met for module : toccer');
+                _this.setState('processing');
+                logger.info('set module state to: ' + _this.getState());
+                logger.info('initialize ssm menu');
+                (ssmOptions.mode === 'icon')
+                  ? logger.info('ssm mode detected: icon')
+                  : logger.info('ssm mode detected: menu');
+                _this.scrollSpy(ssmOptions);
+                _this.buttonInitializer(ssmOptions);
+                clearInterval(dependencies_met_mmenu_initialized);
               }
+            } else {
+              logger.info('found toc in page: disabled');
+              logger.info('disable toc menu and prev|next section buttons');
+              $('#ssm_toc').closest('.ssm-btn').hide();
+              $('#ssm_previous_section').closest('.ssm-btn').hide();
+              $('#ssm_next_section').closest('.ssm-btn').hide();
               _this.scrollSpy(ssmOptions);
               _this.buttonInitializer(ssmOptions);
               clearInterval(dependencies_met_mmenu_initialized);
             }
-          } else {
-            logger.error('initialize ssm failed, HTML data NOT loaded');
           }
         }, 25); // END dependencies_met_mmenu_loaded
       }); // END done
@@ -234,10 +269,9 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       // Create an eventhandler instance if id exists: {{button_id}}
       if ($('#{{button_id}}').length) {
-        eventHandler = "{{item.event_handler}}"
-
+        eventHandler = '{{item.event_handler}}';
         // check if eventhandler configured is a SINGLE word
-        if (eventHandler.split(" ").length == 1) {
+        if (eventHandler.split(' ').length == 1) {
           logger.info('register pre-configured eventhandler {{item.event_handler}} on id: {{button_id}}');
           $('#{{button_id}}').each(function(e) {
             var $this = $(this);
@@ -248,7 +282,8 @@ j1.adapter['ssm'] = (function (j1, window) {
         } else {
           logger.info('register custom eventhandler on id: {{button_id}}');
         }
-
+      } else {
+        alert ('Creating Eventhandler failed on: #{{button_id}}');
       } // END items (buttons)
       {% endif %} // menu_type 'top_level_item'
       {% endif %} // ENDIF button_id enabled
@@ -261,10 +296,15 @@ j1.adapter['ssm'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     // open mobile menu
     // -------------------------------------------------------------------------
-    open_mmenu: function (id) {
-      logger.info('eventhandler fired on id: ' + id );
-    }, // END open_mmenu
+    open_ssm_toc: function () {
+    }, // END open_ssm_toc
 
+    // -------------------------------------------------------------------------
+    // reload page
+    // -------------------------------------------------------------------------
+    reload_page: function () {
+      location.reload();
+    }, // END open_ssm_toc
     // -------------------------------------------------------------------------
     // scroll to previous section
     // -------------------------------------------------------------------------
@@ -276,30 +316,32 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       var index             = 0;
       var maxNode           = $(nodes).length - 1;
-      var $toc              = $("#sidebar");
-      var current_header_id = $toc.find(".is-active-link").attr('href');
+      var $toc              = $('#sidebar');
+      var current_header_id = $toc.find('.is-active-link').attr('href');
+      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
+      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
 
-      // logger.info('eventhandler fired on id: ' + id );
+      // Correction if mobile (offset: desktop -90px, mobile -80px)
+      scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
 
       nodes.each(function() {
         currentNode = $(this).find(current_header_id);
         if (currentNode.length) {
           if (index > maxNode) {
-            return false
+            return false;
           } else {
             prev_node           = (index > 0) ? nodes[index-1] : nodes[index];
-            previous_header_id  = $(prev_node).find(":header").first()[0].id;
+            previous_header_id  = $(prev_node).find(':header').first()[0].id;
             anchor_id           = '#' + previous_header_id;
 
             $('a[href*="' + current_header_id + '"]').removeClass('is-active-link');
             $('a[href*="' + previous_header_id + '"]').addClass('is-active-link');
 
             j1.core.scrollSmooth.scroll( anchor_id, {
-              duration: {{toccer_options.scrollSmoothDuration}},
-              offset: {{toccer_options.scrollSmoothOffset}},
+              duration: scrollDuration,
+              offset: scrollOffset,
               callback: null
             });
-            return false;
           }
         }
         (index < maxNode) ? index++ : index;
@@ -317,31 +359,32 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       var index             = 0;
       var maxNode           = $(nodes).length -1;
-      var $toc              = $("#sidebar");
-      var current_header_id = $toc.find(".is-active-link").attr('href');
+      var $toc              = $('#sidebar');
+      var current_header_id = $toc.find('.is-active-link').attr('href');
+      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
+      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
 
-      // logger.info('eventhandler fired on id: ' + id );
+      // Correction if mobile (offset: desktop -90px, mobile -80px)
+      scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
 
       nodes.each(function() {
         currentNode = $(this).find(current_header_id);
         if (currentNode.length) {
           if (index == maxNode) {
-            return false
+            return false;
           } else {
             nextNode = nodes[index+1];
-            next_header_id  = $(nextNode).closest().find(":header").first();
-            next_header_id  = $(nextNode).find(":header").first()[0].id;
+            next_header_id  = $(nextNode).find(':header').first()[0].id;
             anchor_id       = '#' + next_header_id;
 
             $('a[href*="' + current_header_id + '"]').removeClass('is-active-link');
             $('a[href*="' + next_header_id + '"]').addClass('is-active-link');
 
             j1.core.scrollSmooth.scroll( anchor_id, {
-              duration: {{toccer_options.scrollSmoothDuration}},
-              offset: {{toccer_options.scrollSmoothOffset}},
+              duration: scrollDuration,
+              offset: scrollOffset,
               callback: null
             });
-            return false;
           }
         }
         (index < maxNode) ? index++ : index;
@@ -354,8 +397,6 @@ j1.adapter['ssm'] = (function (j1, window) {
     scroll_to_top: function () {
       var dest = 0;
 
-      // logger.info('eventhandler fired on id: ' + id );
-
       $('html, body').animate({
         scrollTop: dest
       }, 500);
@@ -369,9 +410,7 @@ j1.adapter['ssm'] = (function (j1, window) {
       var $footer         = $('#j1_footer');
       var f               = $footer.length ? $footer.outerHeight() : 0;
       var pageHeight      = $page.height() - f - 400;
-      var pageHeightOuter = $page.outerHeight()
-
-      // logger.info('eventhandler fired on id: ' + id );
+      var pageHeightOuter = $page.outerHeight();
 
       $('html, body').animate({
         scrollTop: pageHeight
@@ -382,16 +421,15 @@ j1.adapter['ssm'] = (function (j1, window) {
     // scroll to comments (Disqus)
     // -------------------------------------------------------------------------
     scroll_to_comments: function () {
-      // logger.info('eventhandler fired on id: ' + id );
     }, // END scroll_comments
 
     // -------------------------------------------------------------------------
     // create generic alert
     // -------------------------------------------------------------------------
-    alert_me: function (id) {
-      // logger.info('eventhandler fired on id: ' + id );
-      alert ("Hello world!");
+    alert_me: function () {
+      alert ('Hello world!');
     }, // END alert_me
+
     // -------------------------------------------------------------------------
     // messageHandler
     // Manage messages (paylods) send from other J1 modules
@@ -454,23 +492,18 @@ j1.adapter['ssm'] = (function (j1, window) {
         var $footer         = $('#j1_footer');
         var $ssmContainer   = $('#ssm-container');
         var $page           = $(document);
-
         var offset          = 0;
-        var pageOffset      = -120;
+        var pageOffset      = $(document).width() >= 992 ? -120 : -116;
         var scrollPos       = $(document).scrollTop();
-        var pageHeight      = $page.height()
-        var pageHeightOuter = $page.outerHeight()
+        var pageHeight      = $page.height();
+        var pageHeightOuter = $page.outerHeight();
 
-//      var m               = parseInt(pagehead.css('margin-bottom'), 10);
         var m               = $main_content.offset().top;
         var s               = $ssmContainer.length ? $ssmContainer.height() : 0;
         var f               = $footer.length   ? $footer.outerHeight() : 0;
         var n               = $navbar.length   ? $navbar.height() : 0;
 //      var h               = $pagehead.length ? $pagehead.outerHeight() : 0;
         var a               = $adblock.length  ? $adblock.outerHeight() : 0;
-
-//      var o               = n + h + a + offset;
-//      var o               = n + m + offset;
         var o               = n + offset;
 
         // space above the (fixed) ssm container

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -61,6 +61,10 @@ regenerate:                             false
   {% assign theme_ext       = "min.css" %}
 {% endif %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 /*
  # -----------------------------------------------------------------------------
@@ -86,6 +90,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['themer'] = (function (j1, window) {
@@ -199,8 +209,8 @@ j1.adapter['themer'] = (function (j1, window) {
         themeExtensionCss     = user_state.theme_extension_css;
       }
       if (themeCss) {
-        themeCssHtml          = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";
-        themeExtensionCssHtml = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+        themeCssHtml          = '<link rel="stylesheet" id="' + id + '" href="' + themeCss + '" type="text/css" />';
+        themeExtensionCssHtml = '<link rel="stylesheet" id="' + id +'" href="' + themeExtensionCss + '" type="text/css" />';
       } else {
         themeName             = default_theme_name;
         themeCssHtml          = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
@@ -221,6 +231,7 @@ j1.adapter['themer'] = (function (j1, window) {
         logger.info('themes detected as: enabled');
         logger.info('theme is being initialized: ' + themeName);
 
+      /* eslint-disable */
       $.when (
         $('#ThemeList').bootstrapThemeSwitcher.defaults = {
           debug:                    {{ themer_options.debug | json }},
@@ -241,27 +252,22 @@ j1.adapter['themer'] = (function (j1, window) {
           includeBootswatch:        {{ themer_options.includeBootswatch | json }},
           skipIncludeBootswatch:    {{ themer_options.skipIncludeBootswatch | json }}
         })
-        .then (function() {
-          if (themeName === 'Uno' || themeName === 'Bootstrap') {
-            theme = environment === 'production'
-              ? themeName.toLowerCase() + '.min.css'
-              : themeName.toLowerCase() + '.css';
-          } else {
-            theme = 'bootstrap.css';  // fallback
-          }
-          logger.info('theme loaded: ' + themeName);
-          logger.info('theme file: ' + theme);
-          _this.setState('finished');
-          logger.info('state: ' + _this.getState());
-          logger.info('module initialized successfully');
-          var dependencies_colors_loaded = setInterval (function() {
-            if (typeof j1.colors !== 'undefined') {
-              // set general|global theme colors
-              _this.setCss();
-              clearInterval(dependencies_colors_loaded);
-            }
-          }, 25); // END 'dependencies_colors_loaded'
-        });
+      /* eslint-enable */
+      .done (function(ThemeList) {
+        if (themeName === 'Uno' || themeName === 'Bootstrap') {
+          theme = environment === 'production'
+            ? themeName.toLowerCase() + '.min.css'
+            : themeName.toLowerCase() + '.css';
+        } else {
+          theme = 'bootstrap.css';  // fallback
+        }
+        logger.info('theme loaded: ' + themeName);
+        logger.info('theme file: ' + theme);
+        _this.setState('finished');
+        logger.info('state: ' + _this.getState());
+        logger.info('module initialized successfully');
+
+      });
       {% else %}
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
@@ -278,33 +284,6 @@ j1.adapter['themer'] = (function (j1, window) {
     setCss: function () {
       var bg_primary                      = j1.getStyleValue('bg-primary', 'background-color');
 
-  //  var admonitionblock_note_color      = j1.getStyleValue('icon-note', 'color');
-  //  var admonitionblock_tip_color       = j1.getStyleValue('icon-tip', 'color');
-  //  var admonitionblock_important_color = j1.getStyleValue('icon-important', 'color');
-  //  var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
-  //  var admonitionblock_caution_color   = j1.getStyleValue('icon-caution', 'color');
-
-      // var admonitionblock_note_color      = j1.getStyleValue('btn-info', 'background-color');
-      // var admonitionblock_tip_color       = j1.getStyleValue('btn-success', 'background-color');
-      // var admonitionblock_important_color = j1.getStyleValue('btn-warning', 'background-color');
-      // var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
-      // var admonitionblock_caution_color   = j1.getStyleValue('btn-danger', 'background-color');
-      //
-      // var tabs_pills_link_color_active    = j1.setColorData('md_blue');         // j1.getStyleValue('btn-info', 'background-color');
-      // var tabs_pills_link_color_hover     = j1.setColorData('md_gray_300');     // j1.getStyleValue('btn-secondary', 'background-color');
-      //
-      // $('head').append('<style>.g-bg-primary { background-color: ' +bg_primary+ ' !important; }</style>');
-      // $('head').append('<style>.mdi-md-bg-primary { color: ' +bg_primary+ '; }</style>');
-      //
-      // $('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
-      // $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
-      //
-      // $('head').append('<style>.icon-note { color: ' +admonitionblock_note_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-tip { color: ' +admonitionblock_tip_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-important { color: ' +admonitionblock_important_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-warning { color: ' +admonitionblock_warning_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-caution { color: ' +admonitionblock_caution_color+ ' !important; }</style>');
-
       return true;
     }, // END setCss
 
@@ -354,5 +333,9 @@ j1.adapter['themer'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}