j1-template 2022.0.10 → 2022.0.11

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

@@ -82,24 +82,10 @@ regenerate:                             true
 {% assign themer_enabled            = modules.themer_options.enabled %}
 {% assign themer_reloadPageOnChange = modules.themer_options.reloadPageOnChange %}
 {% assign themer_hideOnReload       = modules.themer_options.hideOnReload %}
-{% assign comment_provider          = template_config.comments.provider %}
+
 
 {% comment %} Set variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if comment_provider == 'disqus' %}
-  {% assign site_id = template_config.comments.disqus.site_id %}
-{% elsif comment_provider == 'hyvor' %}
-  {% assign site_id = template_config.comments.hyvor.site_id %}
-{% elsif comment_provider == 'commento' %}
-  {% assign site_id = template_config.comments.commento.site_id %}
-{% elsif comment_provider == 'just-comments' %}
-  {% assign site_id = template_config.comments.just-comments.site_id %}
-{% elsif comment_provider == 'facebook' %}
-  {% assign site_id = template_config.comments.facebook.site_id %}
-{% else %}
-  {% assign site_id = false %}
-{% endif %}
-
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -115,14 +101,6 @@ regenerate:                             true
   {% assign language = "en" %}
 {% endif %}
 
-{% if language == "en" %}
-  {% assign comments_headline = template_config.comments.comments_headline.en %}
-{% endif %}
-
-{% if language == "de" %}
-  {% assign comments_headline = template_config.comments.comments_headline.de %}
-{% endif %}
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/j1_template.js
@@ -151,7 +129,6 @@ regenerate:                             true
 /* eslint semi: "off"                                                         */
 // -----------------------------------------------------------------------------
 'use strict';
-
 var j1 = (function () {
 
   // ---------------------------------------------------------------------------
@@ -848,6 +825,7 @@ var j1 = (function () {
       var categoryAllowed;
 
       // provider APIs require user consent
+      // -----------------------------------------------------------------------
       var meta_analytics        = $('meta[name=analytics]').attr('content');
       var analytics             = (meta_analytics === 'true') ? true: false;
       var meta_comments         = $('meta[name=comments]').attr('content');
@@ -864,6 +842,7 @@ var j1 = (function () {
       var personalization       = (meta_personalization === 'true') ? true: false;
 
       // if personalized content detected, page requires user consent
+      // -----------------------------------------------------------------------
       if (personalization && !user_consent.personalization) {
         // redirect to error page: blocked content
         window.location.href = '/444.html';
@@ -873,7 +852,9 @@ var j1 = (function () {
       logText= '\n' + 'loading page partials: started';
       logger.info(logText);
 
-      if (j1.appDetected()) { // app mode
+      if (j1.appDetected()) {
+        // app mode
+        // ---------------------------------------------------------------------
         logger.info('\n' + 'mode detected: app');
 
         $.when ($.ajax(ep_status))
@@ -916,78 +897,22 @@ var j1 = (function () {
 
           // show the page delayed
           setTimeout (function() {
-            // Manage providers for personalization OptIn/Out (Comments|Ads)
-            if (!user_consent.personalization) {
-              logger.debug('\n' + 'disable comment provider: ' + comment_provider);
-              logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
-              $('#leave-a-comment').remove();
-              if (comment_provider === 'disqus') {
-                $('#dsq-count-scr').remove();
-                $('#disqus-thread').remove();
-              }
-              if (comment_provider === 'hyvor') {
-                $('#hyvor-embed').remove();
-                $('#hyvor-talk-view').remove();
-              }
-            } else {
-              if (comments) {
-                logger.info('\n' + 'enable comment provider: ' + comment_provider);
-                $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
-                if (comment_provider === 'disqus') {
-                  logger.info('\n' + 'load comment provider code: ' + comment_provider);
-                  $('#main-content').append('<div id="disqus_thread"></div>');
-                  $('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
-                  j1.loadJS({
-                    xhr_data_path:    '/assets/data/' + comment_provider + '.js',
-                    xhr_data_element: comment_provider
-                  });
-                }
-                if (comment_provider === 'hyvor') {
-                  $('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
-                  $('#main-content').append('<div id="hyvor-talk-view"></div>');
-                  $('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
-                }
-              }
-            }
-
             // display page
-           $('#no_flicker').css('display', 'block');
+            $('#no_flicker').css('display', 'block');
 
-           // no dropcaps if translation enabled
-           if (user_translate.translationEnabled) {
+            // manage Dropcaps if translation is enabled|disabled
+            // -----------------------------------------------------------------
+            if (user_translate.translationEnabled) {
              logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
              logger.debug('\n' + 'skipped processing of dropcaps');
-           } else {
+            } else {
              // initialize dropcaps
              logger.info('\n' + 'post processing: createDropCap');
              j1.core.createDropCap();
-           }
-
-             // add recommended title to hyvor iframe for SEO optimization (if loadad)
-            if (comment_provider === 'hyvor') {
-              var dependencies_met_load_finished = setInterval (function () {
-                if ($('#hyvor-talk-view').children().length) {
-                    $('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
-                    clearInterval(dependencies_met_load_finished);
-                }
-              }, 25);
-            }
-            // NOTE: Placed tracking warning/info here because page may reloaded
-            // after cookie consent selection
-            if (user_consent.analysis) {
-              logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
-              if (tracking_enabled && !tracking_id_valid) {
-                logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
-              } else if (tracking_enabled && tracking_id_valid) {
-                logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
-              } else {
-                logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
-              }
-            } else {
-              logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
             }
 
-            // show|hide cookie icon (should MOVED to Cookiebar ???)
+            // TODO: should MOVED to Cookiebar ???
+            // show|hide cookie icon
             if (j1.existsCookie(cookie_names.user_consent)) {
               // Display cookie icon
               logText = '\n' + 'show cookie icon';
@@ -1000,6 +925,7 @@ var j1 = (function () {
               $('#quickLinksCookieButton').css('display', 'none');
             }
 
+            // TODO: should MOVED to ControlCenter Adapter ???
             // -----------------------------------------------------------------
             // show cc icon (currently NOT supported)
             // $('#quickLinksControlCenterButton').css('display', 'block');
@@ -1020,6 +946,7 @@ var j1 = (function () {
               $('#quickLinksSignInOutButton').css('display', 'block');
             }
 
+            // TODO: should MOVED to Themer ???
             // jadams, 2021-07-25: hide|show themes menu on cookie consent
             // (analysis|personalization) settings. BootSwatch is a 3rd party
             // is using e.g GA. Because NO control is possible on 3rd parties,
@@ -1033,10 +960,7 @@ var j1 = (function () {
               $("#themes_menu").show();
             }
 
-            // if the page requested contains an anchor element,
-            // do a smooth scroll to
-            j1.scrollTo();
-
+            // detect if a loaded page has been chenged
             if (user_session.previous_page !== user_session.current_page) {
               logText = '\n' + 'page change detected';
               logger.info(logText);
@@ -1052,57 +976,34 @@ var j1 = (function () {
             current_user_data = j1.mergeData(user_session, user_state);
             j1.core.navigator.updateSidebar(current_user_data);
 
-            // Set|Log status
+            // set|log status
             state = 'finished';
             j1.setState(state);
             logText = '\n' + 'state: ' + state;
             logger.info(logText);
             logText = '\n' + 'page finalized successfully';
             logger.info(logText);
+
+            // do a (smooth) scroll if all nav elements ready
+            // -----------------------------------------------------------------
+            var dependencies_met_navigator_finished = setInterval(function() {
+              if (j1.adapter.navigator.getState() == 'finished') {
+                // if a page requested contains an anchor element, do a smooth scroll
+                j1.scrollTo();
+                clearInterval(dependencies_met_navigator_finished);
+              }
+            }, 25);
           }, flickerTimeout);
         });
       } else {
         // web mode
+        // ---------------------------------------------------------------------
         setTimeout (function() {
           // j1.setState('finished');
           logger.info('\n' + 'state: finished');
           logger.info('\n' + 'page initialization: finished');
 
-          // Manage providers for personalization OptIn/Out (Comments|Ads)
-          if (!user_consent.personalization) {
-            logger.debug('\n' + 'disable comment provider: ' + comment_provider);
-            logger.debug('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
-            $('#leave-a-comment').remove();
-            if (comment_provider === 'disqus') {
-              $('#dsq-count-scr').remove();
-              $('#disqus-thread').remove();
-            }
-            if (comment_provider === 'hyvor') {
-              $('#hyvor-embed').remove();
-              $('#hyvor-talk-view').remove();
-            }
-          } else {
-            if (comments) {
-              logger.info('\n' + 'enable comment provider: ' + comment_provider);
-              $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
-              if (comment_provider === 'disqus') {
-                logger.info('\n' + 'load comment provider code: ' + comment_provider);
-                $('#main-content').append('<div id="disqus_thread"></div>');
-                $('body').append('<script async id="dsq-count-scr" src="//' + site_id + '.disqus.com/count.js"></script>');
-                j1.loadJS({
-                  xhr_data_path:    '/assets/data/' + comment_provider + '.js',
-                  xhr_data_element: comment_provider
-                });
-              }
-              if (comment_provider === 'hyvor') {
-                $('body').append('<script> var HYVOR_TALK_WEBSITE = ' + site_id + '; var HYVOR_TALK_CONFIG = { url: false, id: false };');
-                $('#main-content').append('<div id="hyvor-talk-view"></div>');
-                $('body').append('<script async id="hyvor-embed" type="text/javascript" src="//talk.hyvor.com/web-api/embed.js"></script>');
-              }
-            }
-          }
-
-          // display page
+          // display the page loaded
           $('#no_flicker').css('display', 'block');
 
           // jadams, 2021-11-19: test code for 'tapTarget' of 'materializeCss'
@@ -1129,7 +1030,8 @@ var j1 = (function () {
               $(this).parents(".card-header").toggleClass("highlight");
           });
 
-          // no dropcaps if translation enabled
+          // manage Dropcaps if translation is enabled|disabled
+          // -------------------------------------------------------------------
           if (user_translate.translationEnabled) {
             logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
             logger.debug('\n' + 'skipped processing of dropcaps');
@@ -1139,31 +1041,6 @@ var j1 = (function () {
             j1.core.createDropCap();
           }
 
-          // add recommended title to hyvor iframe for SEO optimization (if loadad)
-         if (comment_provider === 'hyvor') {
-           var dependencies_met_load_finished = setInterval (function () {
-             if ($('#hyvor-talk-view').children().length) {
-               $('#hyvor-talk-iframe').prop('title', 'Hyvor talk iframe');
-               clearInterval(dependencies_met_load_finished);
-             }
-           }, 25);
-         }
-
-          // NOTE: Placed tracking warning/info here because page may reloaded
-          // after cookie consent selection
-          if (user_consent.analysis) {
-            logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analysis);
-            if (tracking_enabled && !tracking_id_valid) {
-              logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
-            } else if (tracking_enabled && tracking_id_valid) {
-              logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
-            } else {
-              logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
-            }
-          } else {
-            logger.debug('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
-          }
-
           logger.info('\n' + 'mode detected: web');
           logger.info('\n' + 'hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
@@ -1177,9 +1054,12 @@ var j1 = (function () {
               expires:  0
           });
 
+          // TODO: should MOVED to ControlCenter Adapter ???
+          // -----------------------------------------------------------------
           // show cc icon (currently NOT supported)
           // $('#quickLinksControlCenterButton').css('display', 'block');
 
+          // TODO: should MOVED to Cookiebar ???
           // show|hide cookie icon
           if (j1.existsCookie(cookie_names.user_consent)) {
             // Display cookie icon
@@ -1193,6 +1073,7 @@ var j1 = (function () {
             $('#quickLinksCookieButton').css('display', 'none');
           }
 
+          // TODO: should MOVED to Themer ???
           // jadams, 2021-07-25: hide|show themes menu on cookie consent
           // (analysis|personalization) settings. BootSwatch is a 3rd party
           // is using e.g GA. Because NO control is possible on 3rd parties,
@@ -1206,10 +1087,7 @@ var j1 = (function () {
             $("#themes_menu").show();
           }
 
-          // If the page requested contains an anchor element,
-          // do a smooth scroll
-          j1.scrollTo();
-
+          // detect if a loaded page has been chenged
           if (user_session.previous_page !== user_session.current_page) {
             logText = '\n' + 'page change detected';
             logger.info(logText);
@@ -1225,13 +1103,23 @@ var j1 = (function () {
           current_user_data = j1.mergeData(user_session, user_state);
           j1.core.navigator.updateSidebar(current_user_data);
 
-          // Set|Log status
+          // set|log status
           state = 'finished';
           j1.setState(state);
           logText = '\n' + 'state: ' + state;
           logger.info(logText);
           logText = '\n' + 'page finalized successfully';
           logger.info(logText);
+
+          // do a (smooth) scroll if all nav elements ready
+          // -------------------------------------------------------------------
+          var dependencies_met_navigator_finished = setInterval(function() {
+            if (j1.adapter.navigator.getState() == 'finished') {
+              // if a page requested contains an anchor element, do a smooth scroll
+              j1.scrollTo();
+              clearInterval(dependencies_met_navigator_finished);
+            }
+          }, 25);
         }, flickerTimeout);
       }
     },
@@ -1324,9 +1212,9 @@ var j1 = (function () {
       var anchor          = window.location.href.split('#')[1];
       var anchor_id       = typeof anchor !== 'undefined' ? '#' + anchor : false;
       var scrollDuration  = {{toccer_options.scrollSmoothDuration}};
+      var scrollOffset    = j1.getScrollOffset();
       var isSlider        = false;
       var selector;
-      var scrollOffset;
 
       if (typeof anchor === 'undefined') {
         return false;
@@ -1334,15 +1222,13 @@ var j1 = (function () {
         return false;
       }
 
-      scrollOffset    = j1.getScrollOffset();
-
       // Check if the anchor is an slider/gallery element
       if (typeof anchor !== 'undefined') {
-        isSlider  = anchor.includes('slide');
+        isSlider = anchor.includes('slide');
       }
 
       if (anchor_id && anchor_id !== '#' && !isSlider) {
-        // scroll only, if an anchor is given with URL
+        // scroll only, if an anchor is given with an URL
         selector = $(anchor_id);
         if (selector.length) {
           j1.core.scrollSmooth.scroll(anchor_id, {
@@ -1669,11 +1555,11 @@ var j1 = (function () {
         domainAttribute = domain;
         stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
       } else  {
-        domainAttribute = '';
+        domainAttribute = 'localhost';
         stringifiedAttributes += '; ' + 'Domain=' + domainAttribute;
       }
 
-      if (settings.secure == 'true') {
+      if (settings.secure == true) {
         stringifiedAttributes += '; ' + 'Secure=' + settings.secure;
       }
 

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

@@ -76,10 +76,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['justifiedGallery'] = (function (j1, window) {
+j1.adapter.justifiedGallery = (function (j1, window) {
 
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -89,10 +89,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['justifiedGalleryCustomizer'] = (function (j1, window) {
+j1.adapter.justifiedGalleryCustomizer = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -80,11 +80,7 @@ regenerate:                             false
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
---------------------------------------------------------------- {% endcomment %}
-// j1.Lightbox = (function (j1, window) {
-j1.adapter['lightbox'] = (function (j1, window) {
+j1.adapter.lightbox = (function (j1, window) {
 
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -80,8 +80,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-j1.adapter['logger'] = (function (j1, window) {
+j1.adapter.logger = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals

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

@@ -101,8 +101,7 @@ regenerate: true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-j1.adapter['mmenu'] = (function (j1, window) {
+j1.adapter.mmenu = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals
@@ -363,7 +362,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                   logger.debug('\n' + 'hide|show the main nav menu');
                   // switch off|on the (main) nav menu
                   $('#' + navMenuOptions.nav_main_menu).toggle();
-                  $('#' + navMenuOptions.nav_quicklinks).toggle();                  
+                  $('#' + navMenuOptions.nav_quicklinks).toggle();
                 }
               });
 

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

@@ -148,8 +148,7 @@ ToDo: Remove configuration from j1_navigator.yml
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-j1.adapter['navigator'] = (function (j1, window) {
+j1.adapter.navigator = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals
@@ -400,11 +399,13 @@ j1.adapter['navigator'] = (function (j1, window) {
                     clearInterval(dependencies_met_page_finished);
                   }, 25);
                 }
-                _this.setState('initialized');
+//              _this.setState('initialized');
+                _this.setState('finished');
               }, 25); // END 'dependencies_met_page_finished'
             } else {
               logText = '\n' + 'theme switcher detected as: disabled';
               logger.info(logText);
+              _this.setState('finished');
             }
 
             // -----------------------------------------------------------------

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

@@ -73,10 +73,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['quicksearch'] = (function (j1, window) {
+j1.adapter.quicksearch = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -64,10 +64,7 @@ regenerate:                             false
 /* eslint quotes: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rouge'] = (function (j1, window) {
+j1.adapter.rouge = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // globals

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

@@ -75,10 +75,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rtable'] = (function (j1, window) {
+j1.adapter.rtable = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -89,10 +89,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['rtextResizer'] = (function (j1, window) {
+j1.adapter.rtextResizer = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}

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

@@ -74,10 +74,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['scroller'] = (function (j1, window) {
+j1.adapter.scroller = (function (j1, window) {
 
 {% comment %} Set global variables
 -------------------------------------------------------------------------------- {% endcomment %}

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

@@ -96,8 +96,8 @@ regenerate:                             true
 // -----------------------------------------------------------------------------
 
 'use strict';
+j1.adapter.themer = (function (j1, window) {
 
-j1.adapter['themer'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------

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

@@ -90,10 +90,7 @@ regenerate:                             true
 /* eslint indent: "off"                                                       */
 // -----------------------------------------------------------------------------
 'use strict';
-
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['toccer'] = (function () {
+j1.adapter.toccer = (function () {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}