j1-template 2021.1.26 → 2021.2.0

data/assets/data/panel.html

@@ -640,21 +640,6 @@ exclude_from_search:                    true
               <!-- End recent posts -->
             {% endfor %}
 
-            <!--  jadams: Currently not used -->
-            <!-- div class="row page-load-status">
-              <div class="loader-ellips infinite-scroll-request">
-                <span class="loader-ellips__dot"></span>
-                <span class="loader-ellips__dot"></span>
-                <span class="loader-ellips__dot"></span>
-                <span class="loader-ellips__dot"></span>
-              </div>
-              <p class="infinite-scroll-last">{{infinite_scroll_last}} <a href="/pages/public/blog/navigator/">Blog Navigator</a></p>
-            </div -->
-
-            <!-- div class="row page-scroll-last">
-              <p class="infinite-scroll-last">{{infinite_scroll_last}} <a href="/pages/public/blog/navigator/">Blog Navigator</a></p>
-            </div -->
-
           </div>
           <!-- END container -->
 

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

@@ -1000,7 +1000,7 @@ var j1 = (function () {
               }
             } else {
               if (comments) {
-                logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+                logger.info('\n' + 'enable comment provider: ' + comment_provider);
                 $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
                 if (comment_provider === 'disqus') {
                   logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1042,9 +1042,9 @@ var j1 = (function () {
               if (tracking_enabled && !tracking_id_valid) {
                 logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
               } else if (tracking_enabled && tracking_id_valid) {
-                logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+                logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
               } else {
-                logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+                logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
               }
             } else {
               logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
@@ -1150,7 +1150,7 @@ var j1 = (function () {
             }
           } else {
             if (comments) {
-              logger.warn('\n' + 'enable comment provider: ' + comment_provider);
+              logger.info('\n' + 'enable comment provider: ' + comment_provider);
               $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
               if (comment_provider === 'disqus') {
                 logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1203,9 +1203,9 @@ var j1 = (function () {
             if (tracking_enabled && !tracking_id_valid) {
               logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
             } else if (tracking_enabled && tracking_id_valid) {
-              logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
+              logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
             } else {
-              logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
+              logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
             }
           } else {
             logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);

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

@@ -7,7 +7,7 @@ regenerate:                             true
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1Scroll.js
- # Liquid template to adapt j1Scroll
+ # Liquid template to adapt j1Scroll plugin
  #
  # Product/Info:
  # https://jekyll.one
@@ -21,6 +21,36 @@ regenerate:                             true
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scroll_settings   = modules.j1scroll.settings %}
+
+{% comment %} Set config options (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scroll_options    = scroll_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1Scroll.js
@@ -52,9 +82,11 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
+  var language      = '{{site.language}}';
   var user_agent    = platform.ua;
   var moduleOptions = {};
   var _this;
+  var lastPageInfo;
   var logger;
   var logText;
 
@@ -80,12 +112,10 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this   = j1.adapter.j1Scroll;
-      logger  = log4javascript.getLogger('j1.adapter.j1Scroll');
+      {% comment %} Set global variables
+      -------------------------------------------------------------------------- {% endcomment %}
+      _this = j1.adapter.j1Scroll;
+      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
 
       // initialize state flag
       _this.setState('started');
@@ -100,60 +130,127 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // j1Scroll initializer
-      // -----------------------------------------------------------------------
-      var log_text = '\n' + 'j1Scroll is being initialized';
-      logger.info(log_text);
+      {% comment %} Load module config from yml data (disabled)
+      --------------------------------------------------------------------------
+      // Load  module DEFAULTS|CONFIG
+      //
+      /* eslint-disable */
+      moduleOptions = $.extend({}, {{scroll_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
-      var dependencies_met_page_ready = setInterval (function (options) {
-        if (j1.getState() === 'finished') {
-          var log_text = '\n' + 'j1Scroll is being initialized';
-          logger.info(log_text);
+      if (typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
+      }
 
-          var postWrapperId = '#home_news_panel-scroll-group';
-          var paginatePath  = '/assets/data/news_panel_posts/page';
+      // _this.initialize(moduleOptions);
+      -------------------------------------------------------------------------- {% endcomment %}
 
-          // status:           '.page-scroll-last',
+      _this.initialize();
 
-          $(postWrapperId).j1Scroll({
-            type:                 'infiniteScroll',
-            path:                 paginatePath,
-            elementScroll:        false,
-            scrollThreshold:      300,
-            checkLastPage:        true,
-            status:               true,
-            onInit:               function(){},					                        // Callback after plugin has loaded
-            beforeContentLoaded:  function(link){},	                            // Callback before new content is loaded
-            afterContentLoaded:   function(html){}	                            // Callback after new content has been loaded
-          });
+      _this.setState('finished');
+      logger.info('\n' + 'state: ' + _this.getState());
+      logger.info('\n' + 'module initialized successfully');
+    }, // END init
+
+    // -----------------------------------------------------------------------
+    // Generate scrollers configured/enabled
+    // -----------------------------------------------------------------------
+    initialize: function () {
+      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
 
-          $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
-            var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-            var log_text = `\n loaded data from path: ${path}`;
-            logger.info(log_text);
+      var log_text = '\n' + 'j1Scroll is being initialized';
+      logger.info(log_text);
 
-            var log_text = "\n initialize backdrops on load";
-            logger.info(log_text);
+      // START generate scrollers
+      var dependencies_met_page_ready = setInterval (function (options) {
+        if (j1.getState() === 'finished') {
 
-            // initialize backdrops
-            j1.core.createDropCap();
+          {% for item in scroll_options.scrollers %} {% if item.scroller.enabled %}
 
-          });
+          {% assign scroller_id     = item.scroller.id %}
+          {% assign container       = item.scroller.container %}
+          {% assign path            = item.scroller.path  %}
+          {% assign elementScroll   = item.scroller.elementScroll %}
+          {% assign scrollOffset    = item.scroller.scrollOffset %}
+          {% assign lastPage        = item.scroller.lastPage %}
+          {% assign infoLastPage    = item.scroller.infoLastPage %}
+          {% assign lastPageInfo_en = item.scroller.lastPageInfo_en %}
+          {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
 
-          $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
-            var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-            var log_text = `\n request for the next page to be loaded from path: ${path}`;
-            logger.info(log_text);
-          });
+          // scroller_id: {{ scroller_id }}
+          var log_text = '\n' + 'j1Scroll is being initialized on: ' + '{{scroller_id}}';
+          logger.info(log_text);
 
+          {% comment %} Unused options
+          ----------------------------------------------------------------------
+          // status:              '.page-scroll-last',
+          // firstPage:            2,
+          // onInit:               function(){},				                        // Callback after plugin has loaded
+          // onBeforeLoad:         function(link){},	                          // Callback before new content is loaded
+          // onAfterLoad:          function(html){}	                            // Callback after new content has been loaded
+          ---------------------------------------------------------------------- {% endcomment %}
+
+          var container = '#' + '{{container}}';
+          var pagePath  = '{{path}}';
+
+          if (language === 'en') {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          } else if (language === 'de') {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_de|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          } else {
+            lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
+            lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
+            lastPageInfo += '</p></div>';
+          }
+
+          // Create an j1Scroll instance if container exists
+          if ($(container).length) {
+            $(container).j1Scroll({
+              path:                 pagePath,
+              elementScroll:        {{elementScroll}},
+              scrollOffset:         {{scrollOffset}},
+              lastPage:             {{lastPage}},
+              infoLastPage:         {{infoLastPage}},
+              lastPageInfo:         lastPageInfo,
+            });
+          }
+
+          {% comment %} Unused callbacks (disabled)
+          ----------------------------------------------------------------------
+          // $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
+          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
+          //   var log_text = `\n loaded data from path: ${path}`;
+          //   logger.info(log_text);
+          //
+          //   var log_text = "\n initialize backdrops on load";
+          //   logger.info(log_text);
+          //
+          //   // initialize backdrops
+          //   j1.core.createDropCap();
+          //
+          // });
+          //
+          // $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
+          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
+          //   var log_text = `\n request for the next page to be loaded from path: ${path}`;
+          //   logger.info(log_text);
+          // });
+          ---------------------------------------------------------------------- {% endcomment %}
+
+          // END scroller_id: {{ scroller_id }}
+          {% endif %} {% endfor %}
           clearInterval(dependencies_met_page_ready);
         }
       });
-    }, // END init
+      // END generate scrollers
+    },
 
     // -------------------------------------------------------------------------
-    // messageHandler: MessageHandler for J1 CookieConsent module
+    // messageHandler: MessageHandler for j1Scroll module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
     messageHandler: function (sender, message) {