j1-template 2020.0.9 → 2020.0.14

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
@@ -88,8 +99,18 @@ j1.adapter['searcher'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.searcher;
+      logger  = log4javascript.getLogger('j1.adapter.searcher');
+
       // initialize state flag
-      j1.adapter.searcher.state = 'pending';
+      _this.setState('pending');
+      logger.info('state: ' + _this.getState());
+      logger.info('Module is being started');
+
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -99,15 +120,12 @@ j1.adapter['searcher'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.searcher;
-      logger  = log4javascript.getLogger('j1.adapter.searcher');
-
       {% 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 +142,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,
@@ -133,10 +152,11 @@ j1.adapter['searcher'] = (function (j1, window) {
 
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
+        logger.info('module initialized successfully');
       } else {
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
-        logger.info("module disabled");
+        logger.info('module disabled');
       }
 
       return true;
@@ -170,24 +190,28 @@ j1.adapter['searcher'] = (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.searcher.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.searcher.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(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
@@ -27,7 +34,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config     = site %}
+{% assign environment     = site.environment %}
 {% assign template_config = site.data.template_settings %}
 {% assign modules         = site.data.modules %}
 
@@ -43,6 +50,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,17 +71,23 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['ssm'] = (function (j1, window) {
-
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment         = '{{environment}}';
-  var dclFinished         = false;
-  var moduleOptions       = {};
-  var cookie_names        = j1.getCookieNames();
+  const isMobile    = j1.core.isMobile();
+  var environment   = '{{environment}}';
+  var dclFinished   = false;
+  var moduleOptions = {};
+  var cookie_names  = j1.getCookieNames();
   var user_state;
   var user_session;
   var user_data;
@@ -79,11 +97,11 @@ j1.adapter['ssm'] = (function (j1, window) {
   var logger;
   var logText;
 
+
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
 
-
   // ---------------------------------------------------------------------------
   // main object
   // ---------------------------------------------------------------------------
@@ -94,11 +112,21 @@ j1.adapter['ssm'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function (options) {
 
-      // create seetings object from frontmatterOptions
-      var frontmatterOptions = options != null ? $.extend({}, options) : {};
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this         = j1.adapter.ssm;
+      logger        = log4javascript.getLogger('j1.adapter.ssm');
+      sect12Nodes   = $('[class$="sect1"],[class$="sect2"');
+      sect1Nodes    = $('[class$="sect1"]');
 
       // initialize state flag
-      j1.adapter.ssm.state = 'pending';
+      _this.setState('started');
+      logger.info('set module state to: ' + _this.getState());
+      logger.info('module is being initialized');
+
+      // create settings object from frontmatterOptions
+      var frontmatterOptions = options != null ? $.extend({}, options) : {};
 
       // -----------------------------------------------------------------------
       // defaults
@@ -108,25 +136,19 @@ j1.adapter['ssm'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this         = j1.adapter.ssm;
-      logger        = log4javascript.getLogger('j1.adapter.ssm');
-      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);
@@ -134,11 +156,7 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       // save config settings into the mmenu object for global access
       //
-      j1.adapter.ssm['moduleOptions'] = moduleOptions;
-
-      _this.setState('started');
-      logger.info('set module state to: ' + _this.getState());
-      logger.info('module is being initialized');
+      _this['moduleOptions'] = moduleOptions;
 
       // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
       // for J1 Navigator to finish (init)
@@ -151,14 +169,14 @@ j1.adapter['ssm'] = (function (j1, window) {
         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);
+          // 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);
+          // j1.core.ssm.init (moduleOptions);
           _this.ssmLoader(moduleOptions);
           clearInterval(dependencies_met_navigator);
         }
@@ -182,48 +200,51 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       {% assign id_list = "" %}
 
-      $.when (
-        {% assign menu_id       = ssm_options.xhr_container_id %}
-        {% 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}}" },
-          'data_loaded')
-      ).done (function (ssm_html_loaded) {
-        // ---------------------------------------------------------------------
-        // Initialize MMenu Navs and Drawers
-        // ---------------------------------------------------------------------
-        var dependencies_met_mmenu_initialized = setInterval (function () {
-          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 button');
-              $('#ssm_toc').closest('.ssm-btn').hide()
+      j1.xhrData ({
+        xhr_container_id: '{{ssm_options.xhr_container_id}}',
+        xhr_data_path:    '{{ssm_options.xhr_data_path}}' },
+        'j1.adapter.ssm',
+        'data_loaded');
+
+      // ---------------------------------------------------------------------
+      // Initialize MMenu Navs and Drawers
+      // ---------------------------------------------------------------------
+      var dependencies_met_mmenu_initialized = setInterval (function () {
+        if (j1.xhrDOMState['#{{ssm_options.xhr_container_id}}'] == 'success') {
+          _this.setState('loaded');
+          logger.info('set module state to: ' + _this.getState());
+          logger.info('HTML data for ssm: ' + _this.getState());
+          j1.core.ssm.init (moduleOptions);
+          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);
+
+              _this.setState('finished');
+              logger.info('state: ' + _this.getState());
+              logger.info('module initialized successfully');
               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);
           }
-        }, 25); // END dependencies_met_mmenu_loaded
-      }); // END done
+        }
+      }, 25); // END dependencies_met_mmenu_initialized
     }, // END dataLoader
 
     // -------------------------------------------------------------------------
@@ -247,21 +268,21 @@ 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);
             $this.on('click', function(e) {
-              j1.adapter.ssm.{{item.event_handler}}(sect1Nodes);
+              _this.{{item.event_handler}}(sect1Nodes);
             });
           });
         } else {
           logger.info('register custom eventhandler on id: {{button_id}}');
         }
       } else {
-        alert ("Creating Eventhandler failed on: #{{button_id}}");
+        alert ('Creating Eventhandler failed on: #{{button_id}}');
       } // END items (buttons)
       {% endif %} // menu_type 'top_level_item'
       {% endif %} // ENDIF button_id enabled
@@ -294,33 +315,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}};
+
+      // 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
             });
-
-            // scroll the page one pixel back and forth (trigger)
-            // to get the right position for the Toccer
-            //
-            // $(window).scrollTop($(window).scrollTop()+1);
-            // $(window).scrollTop($(window).scrollTop()-1);
           }
         }
         (index < maxNode) ? index++ : index;
@@ -338,34 +358,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}};
+
+      // 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
             });
-
-            // scroll the page one pixel back and forth (trigger)
-            // to get the right position for the Toccer
-            //
-            // $(window).scrollTop($(window).scrollTop()+1);
-            // $(window).scrollTop($(window).scrollTop()-1);
           }
         }
         (index < maxNode) ? index++ : index;
@@ -381,12 +399,6 @@ j1.adapter['ssm'] = (function (j1, window) {
       $('html, body').animate({
         scrollTop: dest
       }, 500);
-
-      // scroll the page one pixel back and forth (trigger)
-      // to get the right position for the Toccer
-      //
-      // $(window).scrollTop($(window).scrollTop()+1);
-      // $(window).scrollTop($(window).scrollTop()-1);
     }, // END scroll_top
 
     // -------------------------------------------------------------------------
@@ -397,17 +409,11 @@ 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()
+      var pageHeightOuter = $page.outerHeight();
 
       $('html, body').animate({
         scrollTop: pageHeight
       }, 500);
-
-      // scroll the page one pixel back and forth (trigger)
-      // to get the right position for the Toccer
-      //
-      // $(window).scrollTop($(window).scrollTop()+1);
-      // $(window).scrollTop($(window).scrollTop()-1);
     }, // END scroll_bottom
 
     // -------------------------------------------------------------------------
@@ -420,7 +426,7 @@ j1.adapter['ssm'] = (function (j1, window) {
     // create generic alert
     // -------------------------------------------------------------------------
     alert_me: function () {
-      alert ("Hello world!");
+      alert ('Hello world!');
     }, // END alert_me
 
     // -------------------------------------------------------------------------
@@ -454,22 +460,6 @@ j1.adapter['ssm'] = (function (j1, window) {
       return true;
     }, // END messageHandler
 
-    // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
-    // -------------------------------------------------------------------------
-    setState: function (stat) {
-      j1.adapter.ssm.state = stat;
-    }, // END setState
-
-    // -------------------------------------------------------------------------
-    // getState
-    // Returns the current (processing) state of the module
-    // -------------------------------------------------------------------------
-    getState: function () {
-      return j1.adapter.ssm.state;
-    }, // END state
-
     // -------------------------------------------------------------------------
     // Manage (top) position and sizes (@media breakpoints) of the
     // SSM container depending on the size of the page header (attic)
@@ -485,23 +475,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
@@ -524,11 +509,27 @@ j1.adapter['ssm'] = (function (j1, window) {
           ? $ssmContainer.css('display','block')
           : $ssmContainer.css('display','none');
 
-        logger.debug('content pos detected as: ' + m + 'px');
-        logger.debug('scroll pos detected as: ' + scrollPos + 'px');
+        // logger.debug('content pos detected as: ' + m + 'px');
+        // logger.debug('scroll pos detected as: ' + scrollPos + 'px');
       }); // END setTop on scroll
 
-    } // END scrollSpy
+    }, // END scrollSpy
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);