j1-template 2020.0.24 → 2021.0.3

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.
@@ -269,12 +269,12 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
                   {% endif %}
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_lightbox+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png" alt="Play Button"></span>' + '\n';
                 } else {
                   content +=  '<a data-sub-html="' +captions_gallery+ '" ';
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_gallery+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png" alt="Play Button"></span>' + '\n';
                 }
                 content +=  '</a>' + '\n';
 

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/lunr_search.js

@@ -11,7 +11,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
@@ -58,7 +58,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/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}}
@@ -318,11 +318,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}}');

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/rouge.js

@@ -11,7 +11,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,21 +45,23 @@ 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
  # -----------------------------------------------------------------------------
+ # Note:
+ #  https://github.com/jirutka/asciidoctor-rouge/issues/9
+ # -----------------------------------------------------------------------------
  #  Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 
-// https://github.com/jirutka/asciidoctor-rouge/issues/9
-
 // -----------------------------------------------------------------------------
 // ESLint shimming
 // -----------------------------------------------------------------------------
 /* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
 
@@ -155,9 +157,9 @@ j1.adapter['rouge'] = (function (j1, window) {
       var dependencies_met_rouge_theme_loaded = setInterval (function () {
         if (j1.adapter.rouge.getState() === 'finished') {
           if ( darkTheme ) {
-            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_dark)
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_dark);
           } else {
-            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_light)
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_light);
           }
           clearInterval(dependencies_met_rouge_theme_loaded);
         }

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

@@ -11,7 +11,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
@@ -29,7 +29,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
@@ -105,9 +105,11 @@ j1.adapter['rtable'] = (function (j1, window) {
         // jadams, 2020-09-16: class 'rtable' indicate use of 'tablesaw'
         if ($(curTable).hasClass('rtable')) {
           // jadams, 2020-09-17: add BS responsive class in case of an overflow
-          $(curTable).addClass('table-responsive')
+          // jadams, 2020-11-21: BS responsive class disabled, bcause the
+          // table doesn't stretch full page width
+          //$(curTable).addClass('table-responsive')
           // jadams, 2020-09-16: add needed CSS class/attribute for tablesaw
-          $(curTable).addClass('tablesaw')
+          $(curTable).addClass('tablesaw');
           $(curTable).attr('data-tablesaw-mode','stack');
         }
       });

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -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
@@ -72,7 +72,7 @@ regenerate:                             false
  # https://jekyll.one
  # https://github.com/jguadagno/bootstrapThemeSwitcher
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  # Copyright (C) 2014 Joseph Guadagno
  #
  # J1 Template is licensed under the MIT License.
@@ -92,7 +92,9 @@ regenerate:                             false
 // ESLint shimming
 // -----------------------------------------------------------------------------
 /* eslint indent: "off"                                                       */
+/* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
+
 'use strict';
 
 j1.adapter['themer'] = (function (j1, window) {
@@ -179,57 +181,63 @@ j1.adapter['themer'] = (function (j1, window) {
         $('head').append(theme_css_html);
       }
 
+      // store if theme_switcher is enabled
+      //
+      user_state.theme_switcher = themerOptions.enabled;
+
       j1.writeCookie({
         name: cookie_user_state_name,
         data: user_state
       });
 
-      {% if themer_options.enabled %}
-        // enable BS ThemeSwitcher
-        logger.info('themes detected as: enabled');
-        logger.info('theme is being initialized: ' + user_state.theme_name);
-
-      var dependencies_met_navigator_started = setInterval (function () {
-        // if (j1.adapter.navigator.getState() == 'started') {
-        if ( $('#remote_themes').length ) {
-          /* 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
+      // 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);
+
+            if ( $('#remote_themes').length ) {
+              /* 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 */
+
+              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: navigator');
+            }
+          } else {
+            _this.setState('finished');
+            logger.info('state: ' + _this.getState());
+            logger.info('themes detected as: disabled');
           }
-          /* eslint-enable */
-
-          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: navigator');
-          clearInterval(dependencies_met_navigator_started);
+          clearInterval(dependencies_met_j1_finished);
         }
-      }, 25); // END 'dependencies_met_navigator_started'
-      {% else %}
-        _this.setState('finished');
-        logger.info('state: ' + _this.getState());
-        logger.info('themes detected as: disabled');
-      {% endif %}
+      }, 25); // END 'dependencies_met_j1_finished'
     }, // END init
 
     // -------------------------------------------------------------------------