j1-template 2021.1.25 → 2021.1.29

data/assets/themes/j1/modules/{infiniteScroll → 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/css/theme/uno.min.css

@@ -0,0 +1,15 @@
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/modules/infiniteScroll/css/uno.min.css
+ # Provides styles for J1 Module infiniteScroll
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+*/
+.page-load-status,.page-scroll-last{display:none;padding-top:.5rem;border-top:1px dotted #212121;color:#777}span.infinite-scroll-last{border-bottom-width:1px;border-bottom-style:dotted;border-bottom-color:#212121;display:inline-block;margin:0 0 -1px 0;padding:10px 3px}.loader-ellips{font-size:20px;position:relative;width:4em;height:1em;margin:10px auto}.loader-ellips__dot{display:block;width:1em;height:1em;border-radius:.5em;background:#555;position:absolute;animation-duration:.5s;animation-timing-function:ease;animation-iteration-count:infinite}.loader-ellips__dot:nth-child(1),.loader-ellips__dot:nth-child(2){left:0}.loader-ellips__dot:nth-child(3){left:1.5em}.loader-ellips__dot:nth-child(4){left:3em}@keyframes reveal{from{transform:scale(0.001)}to{transform:scale(1)}}@keyframes slide{to{transform:translateX(1.5em)}}.loader-ellips__dot:nth-child(1){animation-name:reveal}.loader-ellips__dot:nth-child(2),.loader-ellips__dot:nth-child(3){animation-name:slide}.loader-ellips__dot:nth-child(4){animation-name:reveal;animation-direction:reverse}

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

@@ -0,0 +1,263 @@
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/modules/j1Scroll/js/j1scroll.js
+ # J1 core module for j1scroll
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+*/
+
+// the semi-colon before function invocation is a SAFETY method against
+// concatenated scripts and/or other plugins which may NOT be closed
+// properly.
+//
+;(function($, window, document, undefined) {
+
+	'use strict';
+
+	// Create the defaults
+	var pluginName = 'j1Scroll',
+	defaults = {
+	    type:               	'infiniteScroll',
+	    scrollOffset:    			100,
+	    elementScroll:      	false,
+			firstPage:            2,
+			lastPage:             false,
+			infoLastPage:         false,
+			loadStatus:           false,
+			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"]
+
+		// call the initializer
+		this.init(this.settings);
+	}
+
+	// Avoid Plugin.prototype conflicts
+	$.extend(Plugin.prototype, {
+		// -------------------------------------------------------------------------
+		// init: initializer
+		// -------------------------------------------------------------------------
+		init: function(options) {
+		  var logger = log4javascript.getLogger('j1Scroll');
+
+			logger.info('\n' + 'initializing plugin: started');
+			logger.info('\n' + 'state: started');
+
+			if ( options.elementScroll ) {
+				this.scroller = this.element;
+			} else {
+				this.scroller = window;
+			}
+
+			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 message = options.lastPageInfo;
+				$(message).insertAfter(options.elementID);
+			}
+
+		  // initialize infinite scroll
+		  if ( options.type === 'infiniteScroll') {
+					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
+		// NOTE: 	the calculation for BOTTOM position is different for
+		// 				elementScroll and windowScroll. For elementScroll, the
+		//				trigger isBottomReached is TRUE, if the scroll position has
+		//        the end of the container PLUS a given scrollOffset.
+		//        For windowScroll, the trigger isBottomReached is TRUE, if
+		//        the scroll position has the end of the window MINUS
+		//        a given scrollOffset.
+		// -------------------------------------------------------------------------
+		isBottomReached: function (options) {
+		  var _this = this;
+		  var bottom, scrollY;
+			var clientHeight = $(options.elementID).height();
+
+		  if ( _this.settings.elementScroll ) {
+				// check scroll position of the container items are to be added
+				var $window = $(window);
+				var viewport_top = $window.scrollTop();
+				var viewport_height = $window.height();
+				var viewport_bottom = viewport_top + viewport_height - options.scrollOffset;
+				var $elm = $(options.elementID);
+				var top = $elm.offset().top + clientHeight;
+				var height = $elm.height();
+				bottom = top + height;
+
+
+				return (top >= viewport_top && top < viewport_bottom) ||
+				(bottom > viewport_top && bottom <= viewport_bottom) ||
+				(height > viewport_height && top <= viewport_top && bottom >= viewport_bottom);
+		  } else {
+				// check scroll position of the (overall) window
+				return (window.innerHeight + window.pageYOffset + options.scrollOffset >= document.body.offsetHeight);
+		  }
+		},
+		// -------------------------------------------------------------------------
+		// detectScroll: EventHandler to load new items for infinite scroll
+		// if final scroll position reached
+		// -------------------------------------------------------------------------
+		registerScrollEvent: function (options) {
+		  var _this = this;
+		  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);
+
+			logger.info('\n' + 'scroll event: registered');
+		},
+		// -------------------------------------------------------------------------
+		// 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');
+
+			logger.info('\n' + 'trigger loading ');
+
+			// initialze loader flag
+		  if (this.itemsLoaded === false) return false;
+
+			// set loader flag (false == not loaded)
+		  this.itemsLoaded = false;
+
+			// display spinner while loading
+			if (options.loadStatus) {
+				logger.info('\n' + 'show: spinner');
+				$('.loader-ellips').show();
+			}
+
+		  var xmlhttp = new XMLHttpRequest();
+		  xmlhttp.onreadystatechange = function () {
+		    if (xmlhttp.readyState == XMLHttpRequest.DONE) {
+		      if (xmlhttp.status == 200) {
+		        options.firstPage++;
+		        var childItems = _this.getChildItemsByAjaxHTML(options, xmlhttp.responseText);
+		        _this.appendNewItems(childItems);
+
+						logger.info('\n' + 'loading new items: successful');
+
+						// hide the spinner after loading
+						if (options.loadStatus) {
+							logger.info('\n' + 'hide: spinner');
+							$('.loader-ellips').hide();
+						}
+
+						// set loader flag (true == loaded)
+						return _this.itemsLoaded = true;
+		      } else {
+						// hide the spinner
+						if (options.loadStatus) {
+							logger.info('\n' + 'hide: spinner');
+							$('.loader-ellips').hide();
+						}
+
+						logger.error('\n' + 'loading new items failed, HTTP response: ' + xmlhttp.status );
+						// set loader flag (true == loaded)
+			      return _this.itemsLoaded = false;
+					}
+		    }
+		  };
+			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: 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 + ' > *');
+		  return childItems;
+		},
+		// -------------------------------------------------------------------------
+		// 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' + 'show: infoLastPage');
+			$('.page-scroll-last').show();
+		}
+	}); // END prototype
+
+	// 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));
+	    }
+	  });
+	};
+
+})(jQuery, window, document);

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

@@ -0,0 +1,16 @@
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/modules/j1Scroll/js/j1scroll.min.js
+ # J1 core module for j1scroll
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+*/
+
+(function(e,c,a,g){var d="j1Scroll",f={type:"infiniteScroll",scrollOffset:100,elementScroll:false,firstPage:2,lastPage:false,infoLastPage:false,loadStatus:false,onInit:function(){},onBeforeLoad:function(){},onAfterLoad:function(){}};function b(i,h){this.element=i;this.settings=e.extend({},f,h);this.settings.elementID="#"+this.element.id;this.init(this.settings)}e.extend(b.prototype,{init:function(i){var h=log4javascript.getLogger("j1Scroll");h.info("\ninitializing plugin: started");h.info("\nstate: started");if(i.elementScroll){this.scroller=this.element}else{this.scroller=c}if(i.loadStatus){var k='<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>';e(k).insertAfter(i.elementID)}if(i.infoLastPage){var j=i.lastPageInfo;e(j).insertAfter(i.elementID)}if(i.type==="infiniteScroll"){h.info("\nprocessing mode: infiniteScroll");h.info("\nloading items from path: "+i.path+"#");h.info("\nmonitoring element set to: "+this.scroller);this.registerScrollEvent(i)}h.info("\ninitializing plugin: finished");h.info("\nstate: finished")},isBottomReached:function(s){var n=this;var h,p;var m=e(s.elementID).height();if(n.settings.elementScroll){var j=e(c);var r=j.scrollTop();var i=j.height();var l=r+i-s.scrollOffset;var k=e(s.elementID);var o=k.offset().top+m;var q=k.height();h=o+q;return(o>=r&&o<l)||(h>r&&h<=l)||(q>i&&o<=r&&h>=l)}else{return(c.innerHeight+c.pageYOffset+s.scrollOffset>=a.body.offsetHeight)}},registerScrollEvent:function(i){var k=this;var h=log4javascript.getLogger("j1Scroll");h.info("\nscroll event: register");var j=function(m){var l=k.settings;if(k.isBottomReached(l)){if(l.firstPage>l.lastPage){h.info("\nlast page detected on: "+l.lastPage);c.removeEventListener("scroll",j);h.info("\nscroll event: removed");if(l.infoLastPage){k.infoLastPage(l)}return false}k.getNewPost(l)}};c.addEventListener("scroll",j);h.info("\nscroll event: registered")},getNewPost:function(i){var k=this;var h=log4javascript.getLogger("j1Scroll");h.info("\ntrigger loading ");if(this.itemsLoaded===false){return false}this.itemsLoaded=false;if(i.loadStatus){h.info("\nshow: spinner");e(".loader-ellips").show()}var j=new XMLHttpRequest();j.onreadystatechange=function(){if(j.readyState==XMLHttpRequest.DONE){if(j.status==200){i.firstPage++;var l=k.getChildItemsByAjaxHTML(i,j.responseText);k.appendNewItems(l);h.info("\nloading new items: successful");if(i.loadStatus){h.info("\nhide: spinner");e(".loader-ellips").hide()}return k.itemsLoaded=true}else{if(i.loadStatus){h.info("\nhide: spinner");e(".loader-ellips").hide()}h.error("\nloading new items failed, HTTP response: "+j.status);return k.itemsLoaded=false}}};h.info("\nloading new items from path: "+i.path+i.firstPage);j.open("GET",location.origin+i.path+i.firstPage+"/index.html",true);j.send()},getChildItemsByAjaxHTML:function(j,i){var l=a.createElement("html");var h=log4javascript.getLogger("j1Scroll");h.info("\nload new items");l.innerHTML=i;var k=l.querySelectorAll(j.elementID+" > *");return k},appendNewItems:function(h){var j=this;var i=log4javascript.getLogger("j1Scroll");i.info("\nappend new items");h.forEach(function(k){j.element.appendChild(k)});i.info("\npost processing: createDropCap");j1.core.createDropCap()},infoLastPage:function(i){var j=this;var h=log4javascript.getLogger("j1Scroll");h.info("\nshow: infoLastPage");e(".page-scroll-last").show()}});e.fn[d]=function(h){return this.each(function(){if(!e.data(this,"plugin_"+d)){e.data(this,"plugin_"+d,new b(this,h))}})}})(jQuery,window,document);

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,27 +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 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.25'
+  VERSION = '2021.1.29'
 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.25'
+gem 'j1-template', '~> 2021.1.29'
 
 # ------------------------------------------------------------------------------
 # 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.25
+version:                                2021.1.29
 
 # version
 # ------------------------------------------------------------------------------