j1-template 2021.1.10 → 2021.1.11

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.1.10",
+  "version": "2021.1.11",
   "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.10
+  version: 2021.1.11
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -376,7 +376,6 @@ files:
 - assets/themes/j1/adapter/js/quicksearch.js
 - assets/themes/j1/adapter/js/rouge.js
 - assets/themes/j1/adapter/js/rtable.js
-- assets/themes/j1/adapter/js/themer.1.js
 - assets/themes/j1/adapter/js/themer.js
 - assets/themes/j1/adapter/js/toccer.js
 - assets/themes/j1/core/css/animate.css
@@ -819,10 +818,6 @@ files:
 - assets/themes/j1/modules/twemoji/js/twemoji.min.js
 - assets/themes/j1/modules/util/js/domready.js
 - assets/themes/j1/modules/util/js/gtag-opt-in.js
-- assets/themes/j1/modules/util/js/js.cookie.js
-- assets/themes/j1/modules/util/js/lite-url.js
-- assets/themes/j1/modules/util/js/lite-url.min.js
-- assets/themes/j1/modules/util/js/platform.js
 - assets/themes/j1/modules/videojs/css/themes/city.css
 - assets/themes/j1/modules/videojs/css/themes/city.min.css
 - assets/themes/j1/modules/videojs/css/themes/fantasy.css

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

@@ -1,326 +0,0 @@
----
-regenerate:                             true
----
-
-{% capture cache %}
-
-{% comment %}
- # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/themer.js
- # Liquid template to adapt theme functions
- #
- # Product/Info:
- # https://jekyll.one
- #
- # Copyright (C) 2021 Juergen Adams
- #
- # J1 Template is licensed under the MIT License.
- # For details, see https://jekyll.one
- #
- # -----------------------------------------------------------------------------
- # Test data:
- #  {{config| debug }}
- # -----------------------------------------------------------------------------
-{% endcomment %}
-
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Set global settings
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site.environment %}
-{% assign template_version  = site.version %}
-{% 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
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign themer_defaults   = modules.defaults.themer.defaults %}
-{% assign themer_settings   = modules.themer.settings %}
-
-{% comment %} Set config options
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign themer_options    = themer_defaults| merge: themer_settings %}
-{% assign default_theme     = template_config.theme %}
-{% assign theme_base        = "core/css/themes" %}
-
-{% if environment == "development" or environment == "test" %}
-  {% assign theme_ext       = "css" %}
-{% else %}
-  {% assign theme_ext       = "min.css" %}
-{% endif %}
-
-{% assign production = false %}
-{% if environment == 'prod' or environment == 'production' %}
-  {% assign production = true %}
-{% endif %}
-
-/*
- # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/themer.js
- # JS Adapter for J1 themer (bootstrapThemeSwitcher)
- #
- # Product/Info:
- # https://jekyll.one
- # https://github.com/jguadagno/bootstrapThemeSwitcher
- #
- # Copyright (C) 2021 Juergen Adams
- # Copyright (C) 2014 Joseph Guadagno
- #
- # J1 Template is licensed under the MIT License.
- # For details, see https://jekyll.one
- # bootstrapThemeSwitcher is licensed under the MIT License.
- # For details, see https://github.com/jguadagno/bootstrapThemeSwitcher/blob/master/LICENSE
- # -----------------------------------------------------------------------------
- # NOTE:
- #  Setup of theme loaders for local_themes|remote_themes moved
- #  to adapter navigator.js
- # -----------------------------------------------------------------------------
- # Adapter generated: {{site.time}}
- # -----------------------------------------------------------------------------
-*/
-
-// -----------------------------------------------------------------------------
-// ESLint shimming
-// -----------------------------------------------------------------------------
-/* eslint indent: "off"                                                       */
-/* eslint quotes: "off"                                                       */
-// -----------------------------------------------------------------------------
-
-'use strict';
-
-j1.adapter['themer'] = (function (j1, window) {
-  // ---------------------------------------------------------------------------
-  // globals
-  // ---------------------------------------------------------------------------
-  var environment               = '{{environment}}';
-  var themerOptions             = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
-  var user_state                = {};
-  var user_consent              = {};
-  var cookie_names              = j1.getCookieNames();
-  var user_state_detected       = false;
-  var styleLoaded               = false;
-  var id                        = 'default';
-  var user_state_cookie;
-  var theme_css_html;
-  var _this;
-  var logger;
-  var logText;
-
-  var cssExtension              = (environment === 'production')
-                                  ? '.min.css'
-                                  : '.css';
-
-  var default_theme_name        = '{{default_theme.name}}';
-  var default_theme_author      = '{{default_theme.author}}';
-  var default_theme_author_url  = '{{default_theme.author_url}}';
-  var default_theme_css_name    = default_theme_name.toLowerCase().replace(' ', '-');
-  var default_theme_css         = '{{asset_path}}/{{theme_base}}/' + default_theme_css_name + '/bootstrap' + cssExtension;
-
-  // ---------------------------------------------------------------------------
-  // helper functions
-  // ---------------------------------------------------------------------------
-
-  function styleSheetLoaded(styleSheet) {
-    var sheets = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
-
-    // find CSS file 'styleSheetName' in document
-    for(var i in document.styleSheets) {
-      if(sheets[i].href && sheets[i].href.indexOf(styleSheet) > -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  // ---------------------------------------------------------------------------
-  // Main object
-  // ---------------------------------------------------------------------------
-  return {
-    // -------------------------------------------------------------------------
-    // initializer
-    // -------------------------------------------------------------------------
-    init: function () {
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this     = j1.adapter.themer;
-      logger    = log4javascript.getLogger('j1.adapter.themer');
-
-      // initialize state flag
-      _this.state = 'started';
-      logger.info('state: ' + _this.getState());
-
-      // detect|set user state cookie
-      user_state_detected = j1.existsCookie(cookie_names.user_state);
-      if (user_state_detected) {
-        user_state        = j1.readCookie(cookie_names.user_state);
-        user_consent       = j1.readCookie(cookie_names.user_consent);
-      }
-
-      // initial theme data
-      if (user_state.theme_css === '') {
-        user_state.theme_name       = default_theme_name;
-        user_state.theme_css        = default_theme_css;
-        user_state.theme_author     = default_theme_author;
-        user_state.theme_author_url = default_theme_author_url;
-      }
-
-      styleLoaded     = styleSheetLoaded(user_state.theme_css);
-      theme_css_html  = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
-
-      // skip loading theme UNO css file except NOT loaded
-      if (!user_state.theme_name.includes('Uno') || !styleLoaded) {
-        $('head').append(theme_css_html);
-      }
-
-      // store if theme_switcher is enabled
-      user_state.theme_switcher = themerOptions.enabled;
-
-      if (!user_consent.analyses || !user_consent.personalization)  {
-        // expire state cookie to session
-        j1.writeCookie({
-          name:     cookie_names.user_state,
-          data:     user_state,
-          samesite: 'Strict'
-        });
-      } else {
-        j1.writeCookie({
-          name:     cookie_names.user_state,
-          data:     user_state,
-          samesite: 'Strict',
-          expires:  365
-        });
-      }
-
-      // jadams, 2021-01-03: dependency has to be checked in more detail
-      var dependencies_met_j1_finished = setInterval (function () {
-        if (j1.getState() == 'finished') {
-          if (themerOptions.enabled) {
-            // enable BS ThemeSwitcher
-            logger.info('themes detected as: enabled');
-            logger.info('theme is being initialized: ' + user_state.theme_name);
-
-            // jadams, 2021-02-22: make sure that remote themes are loaded
-            // max retries = max_count
-
-            // load list of remote themes
-            //
-            if ( $('#remote_themes').length ) {
-              var themes_count;
-              var interval_count = 0;
-              var max_count      = themerOptions.retries;
-
-              /* eslint-disable */
-              // initialize Bootswatch Theme Switcher
-              $('#remote_themes').bootstrapThemeSwitcher.defaults = {
-                debug:                    themerOptions.debug,
-                saveToCookie:             themerOptions.saveToCookie,
-                cssThemeLink:             themerOptions.cssThemeLink,
-                cookieThemeName:          themerOptions.cookieThemeName,
-                cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
-                cookieThemeCss:           themerOptions.cookieThemeCss,
-                cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
-                cookieExpiration:         themerOptions.cookieExpiration,
-                cookiePath:               themerOptions.cookiePath,
-                defaultCssFile:           themerOptions.defaultCssFile,
-                bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
-                bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
-                loadFromBootswatch:       themerOptions.loadFromBootswatch,
-                localFeed:                themerOptions.localThemes,
-                excludeBootswatch:        themerOptions.excludeBootswatch,
-                includeBootswatch:        themerOptions.includeBootswatch,
-                skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
-              }
-              /* eslint-enable */
-
-              // var dependencies_met_remote_themes_loaded = setInterval(function() {
-              //   interval_count += 1;
-              //   themes_count = document.getElementById("remote_themes").getElementsByTagName("li").length;
-              //   if ( themes_count > 0  ) {
-              //     logger.info('remote themes loaded: successfully');
-              //     logger.info('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
-              //
-              //     clearInterval(dependencies_met_remote_themes_loaded);
-              //   } else {
-              //       logger.debug('wait for theme to be loaded: ' + user_state.theme_name);
-              //   }
-              //   if (interval_count > max_count) {
-              //     logger.warn('remote themes loading: failed');
-              //     logger.warn('continue processing');
-              //     clearInterval(dependencies_met_remote_themes_loaded);
-              //   }
-              // }, 25);
-
-              logger.info('theme loaded: ' + user_state.theme_name);
-              logger.info('theme css file: ' + user_state.theme_css);
-              _this.setState('finished');
-              logger.info('state: ' + _this.getState());
-              logger.info('module initialized successfully');
-              logger.info('met dependencies for: j1.adapter');
-            }
-          } else {
-            _this.setState('finished');
-            logger.info('state: ' + _this.getState());
-            logger.info('themes detected as: disabled');
-          }
-          clearInterval(dependencies_met_j1_finished);
-        }
-      }, 25); // END 'dependencies_met_j1_finished'
-    }, // END init
-
-    // -------------------------------------------------------------------------
-    // messageHandler
-    // Manage messages send from other J1 modules
-    // -------------------------------------------------------------------------
-    messageHandler: function (sender, message) {
-      var json_message = JSON.stringify(message, undefined, 2);
-
-      logText = 'received message from ' + sender + ': ' + json_message;
-      logger.info(logText);
-
-      // -----------------------------------------------------------------------
-      //  Process commands|actions
-      // -----------------------------------------------------------------------
-      if (message.type === 'command' && message.action === 'module_initialized') {
-        logger.info(message.text);
-        //
-        // Place handling of other command|action here
-        //
-      }
-    }, // END messageHandler
-
-    // -------------------------------------------------------------------------
-    // 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);
-
-{% endcapture %}
-{% if production %}
-  {{cache| minifyJS }}
-{% else %}
-  {{cache| strip_empty_lines }}
-{% endif %}
-{% assign cache = nil %}

data/assets/themes/j1/modules/util/js/js.cookie.js

@@ -1,163 +0,0 @@
-/*!
- * JavaScript Cookie v2.2.1
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006 - 2019 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-;(function (factory) {
-	var registeredInModuleLoader;
-	if (typeof define === 'function' && define.amd) {
-		define(factory);
-		registeredInModuleLoader = true;
-	}
-	if (typeof exports === 'object') {
-		module.exports = factory();
-		registeredInModuleLoader = true;
-	}
-	if (!registeredInModuleLoader) {
-		var OldCookies = window.Cookies;
-		var api = window.Cookies = factory();
-		api.noConflict = function () {
-			window.Cookies = OldCookies;
-			return api;
-		};
-	}
-}(function () {
-	function extend () {
-		var i = 0;
-		var result = {};
-		for (; i < arguments.length; i++) {
-			var attributes = arguments[ i ];
-			for (var key in attributes) {
-				result[key] = attributes[key];
-			}
-		}
-		return result;
-	}
-
-	function decode (s) {
-		return s.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent);
-	}
-
-	function init (converter) {
-		function api() {}
-
-		function set (key, value, attributes) {
-			if (typeof document === 'undefined') {
-				return;
-			}
-
-			attributes = extend({
-				path: '/'
-			}, api.defaults, attributes);
-
-			if (typeof attributes.expires === 'number') {
-				attributes.expires = new Date(new Date() * 1 + attributes.expires * 864e+5);
-			}
-
-			// We're using "expires" because "max-age" is not supported by IE
-			attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
-
-			try {
-				var result = JSON.stringify(value);
-				if (/^[\{\[]/.test(result)) {
-					value = result;
-				}
-			} catch (e) {}
-
-			value = converter.write ?
-				converter.write(value, key) :
-				encodeURIComponent(String(value))
-					.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
-
-			key = encodeURIComponent(String(key))
-				.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent)
-				.replace(/[\(\)]/g, escape);
-
-			var stringifiedAttributes = '';
-			for (var attributeName in attributes) {
-				if (!attributes[attributeName]) {
-					continue;
-				}
-				stringifiedAttributes += '; ' + attributeName;
-				if (attributes[attributeName] === true) {
-					continue;
-				}
-
-				// Considers RFC 6265 section 5.2:
-				// ...
-				// 3.  If the remaining unparsed-attributes contains a %x3B (";")
-				//     character:
-				// Consume the characters of the unparsed-attributes up to,
-				// not including, the first %x3B (";") character.
-				// ...
-				stringifiedAttributes += '=' + attributes[attributeName].split(';')[0];
-			}
-
-			return (document.cookie = key + '=' + value + stringifiedAttributes);
-		}
-
-		function get (key, json) {
-			if (typeof document === 'undefined') {
-				return;
-			}
-
-			var jar = {};
-			// To prevent the for loop in the first place assign an empty array
-			// in case there are no cookies at all.
-			var cookies = document.cookie ? document.cookie.split('; ') : [];
-			var i = 0;
-
-			for (; i < cookies.length; i++) {
-				var parts = cookies[i].split('=');
-				var cookie = parts.slice(1).join('=');
-
-				if (!json && cookie.charAt(0) === '"') {
-					cookie = cookie.slice(1, -1);
-				}
-
-				try {
-					var name = decode(parts[0]);
-					cookie = (converter.read || converter)(cookie, name) ||
-						decode(cookie);
-
-					if (json) {
-						try {
-							cookie = JSON.parse(cookie);
-						} catch (e) {}
-					}
-
-					jar[name] = cookie;
-
-					if (key === name) {
-						break;
-					}
-				} catch (e) {}
-			}
-
-			return key ? jar[key] : jar;
-		}
-
-		api.set = set;
-		api.get = function (key) {
-			return get(key, false /* read as raw */);
-		};
-		api.getJSON = function (key) {
-			return get(key, true /* read as json */);
-		};
-		api.remove = function (key, attributes) {
-			set(key, '', extend(attributes, {
-				expires: -1
-			}));
-		};
-
-		api.defaults = {};
-
-		api.withConverter = init;
-
-		return api;
-	}
-
-	return init(function () {});
-}));