j1-template 2020.0.25 → 2021.0.4

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -45,7 +45,7 @@ regenerate:                             false
  # Product/Info:
  # {{site.data.j1_config.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.j1_config.theme_author_url}}

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # http://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -53,7 +53,7 @@ regenerate:                             true
  # http://jekyll.one
  # http://www.primebox.co.uk/projects/jquery-cookiebar/
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2016 Ant Parsons (primebox.co.uk)
  #
  # J1 Template is licensed under the MIT License.
@@ -65,6 +65,13 @@ regenerate:                             true
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -64,7 +64,7 @@ regenerate:                             true
  # Product/Info:
  # {{site.data.j1_config.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.j1_config.theme_author_url}}

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -59,7 +59,7 @@ regenerate:                             false
  #  https://jekyll.one
  #  http://davidjbradshaw.github.io/iframe-resizer/
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #  Copyright (C) 2013-15 David J. Bradshaw
  #
  #  J1 Template is licensed under the MIT License.

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -83,7 +83,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -87,7 +87,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -1198,13 +1198,30 @@ var j1 = (function () {
     // writeCookie()
     // Write 'data' to a cookie 'name'. If not exists, the cookie gets
     // created. Returns 'true' if cookie was written, otherwise 'false'.
+    // -------------------------------------------------------------------------
+    // NOTE:
+    //    https://web.dev/samesite-cookies-explained/
+    //    https://developer.mozilla.org/de/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+    //    https://www.smarketer.de/blog/chrome-update-80-cookies/
+    // -------------------------------------------------------------------------
+    // TODO:
+    //    Change attribute "Secure" to true, if HTTPS is used.
+    //    Checks and config changes are to be done.
+    // -------------------------------------------------------------------------
+    // TODO:
+    //    Handling of  attribute "SameSite".
+    //    Config to use this attribute should be configurable
+    //    (what config file?).
+    //    Disabled use for now in general.
+    // -------------------------------------------------------------------------
     //
-    writeCookie: function (options /*name, data, [path, expires, secure]*/) {
+    writeCookie: function (options /*name, data, [path, expires, SameSite, secure]*/) {
       var defaults = {
-          name: '',
           data: {},
-          path: '/',
+          name: '',
           expires: 0,
+          path: '/',
+//        SameSite: 'Strict',
           secure: false
       };
       var settings = $.extend(defaults, options);
@@ -1225,18 +1242,28 @@ var j1 = (function () {
         data_encoded          = window.btoa(data_json);
 
         if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, { expires: settings.expires });
+          Cookies.set(settings.name, data_encoded, {
+            expires: settings.expires,
+//          SameSite: settings.SameSite
+          });
         } else {
-          Cookies.set(settings.name, data_encoded);
+          Cookies.set(settings.name, data_encoded, {
+//          SameSite: settings.SameSite
+          });
         }
       } else {
         cookie_data   = settings.data;
         data_json     = JSON.stringify(settings.data);
         data_encoded  = window.btoa(data_json);
         if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, { expires: settings.expires });
+          Cookies.set(settings.name, data_encoded, {
+            expires: settings.expires,
+//          SameSite: settings.SameSite
+          });
         } else {
-          Cookies.set(settings.name, data_encoded);
+          Cookies.set(settings.name, data_encoded, {
+//          SameSite: settings.SameSite
+          });
         }
       }
 

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # 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
@@ -58,7 +58,7 @@ regenerate:                             true
  # https://jekyll.one
  # https://github.com/miromannino/Justified-Gallery
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2016 Miro Mannino
  #
  # J1 Template is licensed under the MIT License.

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -61,7 +61,7 @@ regenerate:                             false
  # https://jekyll.one
  # https://github.com/lokesh/lightbox2/
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2007, 2018 Lokesh Dhakar
  #
  # J1 Template is licensed under the MIT License.

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

@@ -12,7 +12,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -61,7 +61,7 @@ regenerate:                             false
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one

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

@@ -12,7 +12,7 @@ regenerate: true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -80,7 +80,7 @@ regenerate: true
  # Product/Info:
  # {{site.data.template_settings.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.template_settings.theme_author_url}}
@@ -223,24 +223,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
       {% capture id_list %}{{id_list}}{{menu_id}}{% if forloop.last %}{% else %},{% endif %} {% endcapture %}
       {% endfor %} // ENDFOR menus
 
-        // ---------------------------------------------------------------------
-        // Initialize MMenu Navs and Drawers
-        // ---------------------------------------------------------------------
-        var dependencies_met_all_menu_loaded = setInterval (function () {
-          if (j1.xhrDataState['#navigator_nav_mmenu'] == 'success' && j1.xhrDataState['#navigator_sidebar_mmenu'] == 'success' && j1.xhrDataState['#navigator_toc_mmenu'] == 'success') {
-            logger.info('load HTML data (AJAX): finished');
-            _this.setState('processing');
-            logger.info('status: ' + _this.getState());
-            logger.info('initialize navs and drawers');
-            _this.mmenuInitializer(mmOptions);
-
-            _this.setState('finished');
-            logger.info('state: ' + _this.getState());
-            logger.info('module initialized successfully');
-            logger.info('met dependencies for: xhrData');
-            clearInterval(dependencies_met_all_menu_loaded);
-          }
-        }, 25); // END dependencies_met_all_menu_loaded
+      logger.info('initialize navs and drawers');
+      _this.mmenuInitializer(mmOptions);
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initialized successfully');
+
     }, // END dataLoader
 
     // -------------------------------------------------------------------------
@@ -267,9 +255,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         // menu initializer (NAVIGATION)
         // ---------------------------------------------------------------------
+        // NOTE: Run load check (j1.xhrDataState) before initialization
+        //
         logger.info('initialize mmenu on id: #{{menu_id}}');
         var dependencies_met_{{menu_id}}_loaded = setInterval (function () {
-          if ({{menu_id}}) {
+          if (j1.xhrDataState['#{{menu_id}}'] == 'success' ) {
+            logger.info('met dependencies for: xhrData/{{menu_id}}');
             const menu_selector = document.querySelector('#{{menu_id}}');
             const mmenu_{{menu_id}} = new MmenuLight (
               menu_selector,
@@ -318,11 +309,13 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
 
-            // jadams, 2020-09-30: loading the menues (themes)
-            // from Bootswatch API (set localFeed EMPTY)
-            $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-            // load (local) J1 themes (default settings) from JSON data
-            $('#local_themes_mmenu').bootstrapThemeSwitcher();
+            // jadams, 2020-09-30: loading the menues (themes) if enabled
+            if (themerEnabled) {
+              // from Bootswatch API (set localFeed EMPTY)
+              $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
+              // load (local) J1 themes (default settings) from JSON data
+              $('#local_themes_mmenu').bootstrapThemeSwitcher();
+            }
 
             $('#{{item.menu.content.id}}').show();
             logger.info('initializing mmenu finished on id: #{{menu_id}}');
@@ -340,11 +333,16 @@ j1.adapter['mmenu'] = (function (j1, window) {
           // -------------------------------------------------------------------
           // menu initializer (DRAWER)
           // -------------------------------------------------------------------
+          // TODO: Check if Toggle button make sense/should be implemented
+          // NOTE: Run load check (j1.xhrDataState) before initialization
+          //
           logger.info('initialize mmenu on id: #{{menu_id}}');
           var dependencies_met_{{menu_id}}_loaded = setInterval (function () {
-            if ({{menu_id}} && $('{{item.menu.content.button}}').length) {
-              const menu_selector = document.querySelector('#{{menu_id}}');
+            if (j1.xhrDataState['#{{menu_id}}'] == 'success' &&
+                $('{{item.menu.content.button}}').length) {
+              logger.info('met dependencies for: xhrData/{{menu_id}}');
 
+              const menu_selector = document.querySelector('#{{menu_id}}');
               const mmenu_{{menu_id}} = new MmenuLight (
                 menu_selector,
                 '(max-width: ' + mmOptions.mmenu_plugin.max_width +'px)', {
@@ -367,7 +365,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                   var hasClass;
 
                   // check if the button should be activated
-                  // e.g for TOC only if clas js-toc-content is found
+                  // e.g for TOC only if class js-toc-content is found
                   //
                   if ('{{item.menu.content.button_activated}}' != 'always') {
                     hasClass = $('main').hasClass('{{item.menu.content.button_activated}}');

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

@@ -12,7 +12,7 @@ regenerate:                             true
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -127,7 +127,7 @@ ToDo: Remove configuration from j1_navigator.yml
  # Product/Info:
  # {{site.data.template_settings.theme_author_url}}
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see {{site.data.template_settings.theme_author_url}}
@@ -415,7 +415,6 @@ j1.adapter['navigator'] = (function (j1, window) {
               _this.initAuthClient(_this.navAuthManagerConfig);
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
-              logger.info('met dependencies for: themer');
               clearInterval(dependencies_met_themer_finished);
             }
           }, 25); // END 'dependencies_met_themer_finished'

data/assets/themes/j1/adapter/js/{lunr_search.js → quicksearch.js}

@@ -6,12 +6,12 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lunr_search.js
- # Liquid template to adapt J1LunrSearch
+ # ~/assets/themes/j1/adapter/js/quicksearch.js
+ # Liquid template to adapt Lunr for J1 TemplATE
  #
  # Product/Info:
  # https://jekyll.one
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -38,12 +38,12 @@ regenerate:                             true
 {% assign environment           = site.environment %}
 {% assign template_version      = site.version %}
 
-{% assign lunr_search_defaults  = modules.defaults.lunr_search.defaults %}
-{% assign lunr_search_settings  = modules.lunr_search.settings %}
+{% assign quicksearch_defaults  = modules.defaults.quicksearch.defaults %}
+{% assign quicksearch_settings  = modules.quicksearch.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign lunr_search_options   = lunr_search_defaults | merge: lunr_search_settings %}
+{% assign lunr_search_options   = quicksearch_defaults | merge: quicksearch_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -52,13 +52,13 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/lunr_search.js
- # J1 Adapter for lunr_search
+ # ~/assets/themes/j1/adapter/js/quicksearch.js
+ # J1 Adapter for J1 QuickSearch (Lunr)
  #
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
@@ -76,7 +76,7 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['lunr_search'] = (function (j1, window) {
+j1.adapter['quicksearch'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -103,8 +103,8 @@ j1.adapter['lunr_search'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this   = j1.adapter.lunr_search;
-      logger  = log4javascript.getLogger('j1.adapter.lunr_search');
+      _this   = j1.adapter.quicksearch;
+      logger  = log4javascript.getLogger('j1.adapter.quicksearch');
 
       // initialize state flag
       _this.setState('started');
@@ -115,7 +115,7 @@ j1.adapter['lunr_search'] = (function (j1, window) {
       // defaults
       // -----------------------------------------------------------------------
       var settings = $.extend({
-        module_name: 'j1.adapter.lunr_search',
+        module_name: 'j1.adapter.quicksearch',
         generated:   '{{site.time}}'
       }, options);