j1-template 2021.1.26 → 2021.1.27

data/assets/themes/j1/modules/j1Scroll/css/theme/uno.css

@@ -1,7 +1,7 @@
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/modules/infiniteScroll/css/uno.css
- # Provides styles for J1 Module infiniteScroll
+ # ~/assets/themes/j1/modules/j1Scroll/css/uno.css
+ # Provides styles for J1 Module j1Scroll
  #
  # Product/Info:
  # https://jekyll.one
@@ -32,53 +32,7 @@ span {
 }
 */
 
-/*  groups and items
--------------------------------------------------------------------------------- */
-.list-group-item {
-  width: 96%;
-  margin-right: 1% !important;
-  }
-
-/*  Media breakpoints */
-@media only screen and (min-width: 576px) {
-  .list-group-item.items-auto {
-    width: 48.3%; }
-  .list-group-item.items-1 {
-    width: 96%; }
-  .list-group-item.items-2 {
-    width: 48.3%; }
-  .list-group-item.items-3 {
-    width: 48.3%; }
-  .list-group-item.items-4 {
-    width: 48.3%; } }
-
-@media only screen and (min-width: 768px) {
-  .list-group-item.items-auto {
-    width: 31.333%; }
-  .list-group-item.items-1 {
-    width: 96%; }
-  .list-group-item.items-2 {
-    width: 48.3%; }
-  .list-group-item.items-3 {
-    width: 48.3%; }
-  .list-group-item.items-4 {
-    width: 48.3%; } }
-
-@media only screen and (min-width: 992px) {
-  .list-group-item.items-auto {
-    width: 23.8%; }
-  .list-group-item.items-1 {
-    width: 96%; }
-  .list-group-item.items-2 {
-    width: 48.3%;
-    }
-  .list-group-item.items-3 {
-    width: 31.333%; }
-  .list-group-item.items-4 {
-    width: 23.8%; } }
-
-
-/*  controls
+/* plugin controls
 -------------------------------------------------------------------------------- */
 .page-load-status, .page-scroll-last {
   display: none; /* hidden by default */
@@ -97,7 +51,7 @@ span.infinite-scroll-last {
     padding: 10px 3px;
 }
 
-/*  spinner
+/* plugin spinner
 -------------------------------------------------------------------------------- */
 .loader-ellips {
   font-size: 20px; /* change size here */

data/assets/themes/j1/modules/j1Scroll/js/j1scroll.js

@@ -21,77 +21,93 @@
 
 	'use strict';
 
-	// undefined is used here as the undefined global variable in ECMAScript 3 is
-	// mutable (ie. it can be changed by someone else). undefined isn't really being
-	// passed in so we can ensure the value of it is truly undefined. In ES5, undefined
-	// can no longer be modified.
-
-	// window and document are passed through as local variable rather than global
-	// as this (slightly) quickens the resolution process and can be more efficiently
-	// minified (especially when both are regularly referenced in your plugin).
-
-	// Create the defaults once
+	// Create the defaults
 	var pluginName = 'j1Scroll',
 	defaults = {
-	    type:               'infiniteScroll',
-	    scrollThreshold:    100,
-	    elementScroll:      false,
-	    pNum:               2,
-	    pMaxNum:            6,
-	    enable:             true,
+	    type:               	'infiniteScroll',
+	    scrollThreshold:    	400,
+	    elementScroll:      	false,
+			firstPage:            2,
+			lastPage:             false,
+			loadStatus:           true,
+			onInit:               function (){},					                        		// callback after plugin has initialized
+			onBeforeLoad:         function (){},	                            				// callback before new items are loaded
+			onAfterLoad:          function (){}																				// callback after new items are loaded
 	};
 
 	// Plugin constructor
 	function Plugin (element, options) {
 		this.element            = element;
 		this.settings           = $.extend( {}, defaults, options);
-		this.settings.elementID = this.element["id"]
-		this._defaults          = defaults;
-		this._name              = pluginName;
+		this.settings.elementID = '#' + this.element["id"]
 
 		// call the initializer
 		this.init(this.settings);
 	}
 
 	// Avoid Plugin.prototype conflicts
-	//
 	$.extend(Plugin.prototype, {
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
 		// init: initializer
-		//
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
 		init: function(options) {
-		  var logger = log4javascript.getLogger('j1.core.j1Scroll');
+		  var logger = log4javascript.getLogger('j1Scroll');
 
-			if ( this.settings.elementScroll ) {
-				this.scroller = this.element;
-			} else {
-				this.scroller = window;
+			logger.info('\n' + 'initializing plugin: started');
+			logger.info('\n' + 'state: started');
+
+			if (options.loadStatus) {
+				var spinner = '<div class="loader-ellips" style="display: none"> <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>';
+				$(spinner).insertAfter(options.elementID);
+			}
+
+			if (options.infoLastPage ) {
+				var scroll_last_en = 'More articles can be found with the ';
+				var scroll_last_de = 'Weitere Artikel finden Sie im ';
+				var scroll_last;
+
+				if (document.documentElement.lang === 'en') {
+					scroll_last = scroll_last_en;
+				} else if (document.documentElement.lang === 'de') {
+					scroll_last = scroll_last_de;
+				} else {
+					scroll_last = scroll_last_en;
+				}
+
+				if ( this.settings.elementScroll ) {
+					this.scroller = this.element;
+				} else {
+					this.scroller = window;
+				}
+				var message = '<div class="page-scroll-last"><p class="infinite-scroll-last">' + scroll_last + '<a href="/pages/public/blog/navigator/">Blog Navigator</a></p>	</div>';
+				$(message).insertAfter(options.elementID);
 			}
 
-		  logger.info('\n' + 'initializing core module: started');
-			logger.info('\n' + 'state: started');
 
 		  // initialize infinite scroll
 		  if ( options.type === 'infiniteScroll') {
-		      this.detectScroll(options);
+					logger.info('\n' + 'processing mode: infiniteScroll');
+					logger.info('\n' + 'loading items from path: ' + options.path + "#");
+					logger.info('\n' + 'monitoring element set to: ' + this.scroller);
+		      this.registerScrollEvent(options);
 		  }
+			logger.info('\n' + 'initializing plugin: finished');
+			logger.info('\n' + 'state: finished');
 		},
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
 		// bottomReached: detect final scroll position
-		//
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
 		isBottomReached: function (options) {
 		  var _this = this;
 		  let bottom, scrollY;
-			var clientHeight = $('#' + options.elementID).height();
+			var clientHeight = $(options.elementID).height();
 
 		  if ( _this.settings.elementScroll ) {
 				var $window = $(window);
 				var viewport_top = $window.scrollTop();
 				var viewport_height = $window.height();
 				var viewport_bottom = viewport_top + viewport_height;
-				var $elm = $('#' + options.elementID);
+				var $elm = $(options.elementID);
 				var top = $elm.offset().top + clientHeight;
 				var height = $elm.height();
 				// bottom = top + height - options.scrollThreshold
@@ -104,84 +120,132 @@
 				return (window.innerHeight + window.pageYOffset + options.scrollThreshold >= document.body.offsetHeight);
 		  }
 		},
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
 		// detectScroll: EventHandler to load new items for infinite scroll
 		// if final scroll position reached
-		// -----------------------------------------------------------------------
-		detectScroll: function (options) {
+		// -------------------------------------------------------------------------
+		registerScrollEvent: function (options) {
 		  var _this = this;
-		  var logger = log4javascript.getLogger('j1.core.j1Scroll.detectScroll');
-
-		  logger.info('\n' + 'detectScroll: started');
+		  var logger = log4javascript.getLogger('j1Scroll');
+
+		  logger.info('\n' + 'scroll event: register');
+
+			var eventHandler_onscroll = function (event) {
+				var options = _this.settings;
+
+				if (_this.isBottomReached(options)) {
+					if (options.firstPage > options.lastPage ) {
+						logger.info('\n' + 'last page detected on: ' + options.lastPage);
+						window.removeEventListener('scroll', eventHandler_onscroll);
+						logger.info('\n' + 'scroll event: removed');
+
+						if (options.infoLastPage ) {
+							_this.infoLastPage(options);
+						}
+						return false;
+					}
+					_this.getNewPost(options);
+				}
+		  }
+			window.addEventListener('scroll', eventHandler_onscroll);
 
-		  window.onscroll = function (ev) {
-				var bottomReached = _this.isBottomReached(options);
-				if (bottomReached) _this.getNewPost(options);
-		  };
+			logger.info('\n' + 'scroll event: registered');
 		},
-		// -----------------------------------------------------------------------
-		// getNewPost: load/append new items
-		//
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
+		// getNewPost: load new items (from current path)
+		// Note: loader flag prevents to load items if AJAX load in progress
+		// is NOT finished
+		// -------------------------------------------------------------------------
 		getNewPost: function (options) {
 		  var _this = this;
+			var logger = log4javascript.getLogger('j1Scroll');
 
-		  if (options.pNum >= options.pMaxNum ) {
-		    return;
-		  }
-		  if (this.enable === false) return false;
-		  this.enable = false;
+			// display spinner while loading
+			if (options.loadStatus) {
+				$('.loader-ellips').show();
+			}
+
+			// initialze loader flag
+		  if (this.itemsLoaded === false) return false;
+
+			// set loader flag (false == not loaded)
+		  this.itemsLoaded = false;
 		  var xmlhttp = new XMLHttpRequest();
 		  xmlhttp.onreadystatechange = function () {
 		    if (xmlhttp.readyState == XMLHttpRequest.DONE) {
 		      if (xmlhttp.status == 200) {
-		        options.pNum++;
+		        options.firstPage++;
 		        var childItems = _this.getChildItemsByAjaxHTML(options, xmlhttp.responseText);
 		        _this.appendNewItems(childItems);
-		      }
-		      return _this.enable = true;
+						// set loader flag (true == loaded)
+						logger.info('\n' + 'loading new items: successful');
+
+						// hide the spinner after loading
+						if (options.loadStatus) {
+							$('.loader-ellips').hide();
+						}
+						// set loader flag (true == loaded)
+			      return _this.itemsLoaded = true;
+		      } else {
+						logger.error('\n' + 'loading new items failed, HTTP response: ' + xmlhttp.status );
+						// set loader flag (true == loaded)
+			      return _this.itemsLoaded = false;
+					}
 		    }
 		  };
-		  xmlhttp.open("GET", location.origin + options.path + options.pNum + '/index.html', true);
+			logger.info('\n' + 'loading new items from path: ' + options.path + options.firstPage);
+		  xmlhttp.open("GET", location.origin + options.path + options.firstPage + '/index.html', true);
 		  xmlhttp.send();
 		},
-		// -----------------------------------------------------------------------
-		// getChildItemsByAjaxHTML:
-		//
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
+		// getChildItemsByAjaxHTML: extract items from page loaded
+		// -------------------------------------------------------------------------
 		getChildItemsByAjaxHTML: function (options, HTMLText) {
 		  var newHTML = document.createElement('html');
+			var logger = log4javascript.getLogger('j1Scroll');
 
+			logger.info('\n' + 'load new items');
 		  newHTML.innerHTML = HTMLText;
-		  var childItems = newHTML.querySelectorAll('#' + options.elementID + ' > *');
+		  var childItems = newHTML.querySelectorAll(options.elementID + ' > *');
 		  return childItems;
 		},
-		// -----------------------------------------------------------------------
-		// appendNewItems:
-		//
-		// -----------------------------------------------------------------------
+		// -------------------------------------------------------------------------
+		// appendNewItems: append items and run post processing
+		// -------------------------------------------------------------------------
 		appendNewItems: function (items) {
 		  var _this = this;
+			var logger = log4javascript.getLogger('j1Scroll');
 
+			logger.info('\n' + 'append new items');
 		  items.forEach(function (item) {
 		    _this.element.appendChild(item);
 		  });
 
+			logger.info('\n' + 'post processing: createDropCap');
 			// initialize backdrops
 			j1.core.createDropCap();
+		},
+		// -------------------------------------------------------------------------
+		// getNewPost: load/append new items
+		// Note: loader flag prevents to load items if AJAX load in progress
+		// is NOT finished
+		// -------------------------------------------------------------------------
+		infoLastPage: function (options) {
+		  var _this 		= this;
+			var logger		= log4javascript.getLogger('j1Scroll');
+
+			logger.info('\n' + 'post processing: infoLastPage');
+			$('.page-scroll-last').show();
 		}
-
 	}); // END prototype
 
-	// lightweight plugin wrapper around the constructor,
-	// preventing multiple instantiations
-	//
+	// wrapper around the constructor to prevent multiple instantiations
 	$.fn [pluginName] = function(options) {
 	  return this.each(function() {
-	      if (!$.data( this, "plugin_" + pluginName)) {
-	          $.data(this, "plugin_" +
-	              pluginName, new Plugin(this, options));
-	      }
+	    if (!$.data( this, "plugin_" + pluginName)) {
+	      $.data(this, "plugin_" +
+	        pluginName, new Plugin(this, options));
+	    }
 	  });
 	};
 

data/assets/themes/j1/modules/showOnScroll/js/showOnScroll.js

@@ -1,7 +1,7 @@
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/modules/showOnScroll/js/showOnScroll.js
- # J1 implementation for showOnScroll
+ # Very simple J1 implementation for showOnScroll
  #
  # Product/Info:
  # https://jekyll.one
@@ -12,7 +12,10 @@
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
 */
-
+// -------------------------------------------------------------------------
+// isInViewport:
+// Detects if an element is visible in an viewport specified
+// -------------------------------------------------------------------------
 function isInViewport(elm, offset) {
 	// if the element doesn't exist, abort
 	if( elm.length == 0 ) {
@@ -32,40 +35,36 @@ function isInViewport(elm, offset) {
 	(height > viewport_height && top <= viewport_top && bottom >= viewport_bottom);
 }
 
+// -----------------------------------------------------------------------------
+// Initializer
+// -----------------------------------------------------------------------------
 $(document).ready( function() {
 
   var showDelay =   700;
   var yOffset 	=  500;
-	var logger  	= log4javascript.getLogger('j1.core.showOnScroll');
-
-	// var eventHandler_news_panel = function (event) {
-	// 	var clientHeight = $('#home_news_panel-scroll-group').height();
-	// 	var inViewport = isInViewport ($('#home_news_panel-scroll-group'), clientHeight);
-	//
-  //   if (inViewport) {
-	// 		logger.info('\n' + 'The specified container end reached: home_news_panel-scroll-group');
-  //     //console.log('The specified container is in view.');
-  //     // $(".home_service_panel").show(showDelay);
-  //     // window.removeEventListener('scroll', eventHandler_news_panel);
-  //   }
-  // }
-	// window.addEventListener('scroll', eventHandler_news_panel);
+	var logger  	= log4javascript.getLogger('j1ShowOnScroll');
 
+	// ---------------------------------------------------------------------------
+	// EventHandler: Service Panel
+	// ---------------------------------------------------------------------------
   var eventHandler_service_panel = function (event) {
     if (isInViewport ($('#home_service_panel'), yOffset)) {
-			logger.info('\n' + 'The specified container is in view: home_service_panel');
-      //console.log('The specified container is in view.');
+			logger.info('\n' + 'specified container is in view: home_service_panel');
       $(".home_service_panel").show(showDelay);
+			logger.info('\n' + 'remove eventHandler');
       window.removeEventListener('scroll', eventHandler_service_panel);
     }
   }
 	window.addEventListener('scroll', eventHandler_service_panel);
 
+	// ---------------------------------------------------------------------------
+	// EventHandler: Intro Panel
+	// ---------------------------------------------------------------------------
 	var eventHandler_intro_panel = function (event) {
 		if (isInViewport ($('#home_intro_panel'), yOffset)) {
-			logger.info('\n' + 'The specified container is in view: home_intro_panel');
-			//console.log('The specified container is in view.');
+			logger.info('\n' + 'specified container is in view: home_intro_panel');
 			$(".home_intro_panel").show(showDelay);
+			logger.info('\n' + 'remove eventHandler');
 			window.removeEventListener('scroll', eventHandler_intro_panel);
 		}
 	}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2021.1.26'
-end
+module J1
+  VERSION = '2021.1.27'
+end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.1.26'
+gem 'j1-template', '~> 2021.1.27'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.1.26
+version:                                2021.1.27
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_includes/attributes.asciidoc

@@ -423,7 +423,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.26
+:j1--version:                                     2021.1.27
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.1.26'
+    VERSION = '2021.1.27'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.26",
+  "version": "2021.1.27",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.26",
+  "version": "2021.1.27",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.26",
+  "version": "2021.1.27",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2021.1.26
+  version: 2021.1.27
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -382,7 +382,6 @@ files:
 - assets/themes/j1/adapter/js/cookieConsent.js
 - assets/themes/j1/adapter/js/fam.js
 - assets/themes/j1/adapter/js/framer.js
-- assets/themes/j1/adapter/js/infiniteScroll.js
 - assets/themes/j1/adapter/js/j1.js
 - assets/themes/j1/adapter/js/j1scroll.js
 - assets/themes/j1/adapter/js/justifiedGallery.js
@@ -542,10 +541,6 @@ files:
 - assets/themes/j1/modules/iframeResizer/js/resizer.js
 - assets/themes/j1/modules/iframeResizer/js/resizer.map
 - assets/themes/j1/modules/iframeResizer/js/resizer.min.js
-- assets/themes/j1/modules/infiniteScroll/css/theme/uno.css
-- assets/themes/j1/modules/infiniteScroll/css/theme/uno.min.css
-- assets/themes/j1/modules/infiniteScroll/js/infiniteScroll.js
-- assets/themes/j1/modules/infiniteScroll/js/infiniteScroll.min.js
 - assets/themes/j1/modules/j1Scroll/css/theme/uno.css
 - assets/themes/j1/modules/j1Scroll/css/theme/uno.min.css
 - assets/themes/j1/modules/j1Scroll/js/j1scroll.js