j1-template 2021.2.1 → 2021.2.5

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

@@ -209,10 +209,11 @@ var j1 = (function () {
 
   // initial cookie settings
   var cookie_names = {
-    'app_session':  '{{template_config.cookies.app_session}}',
-    'user_session': '{{template_config.cookies.user_session}}',
-    'user_state':   '{{template_config.cookies.user_state}}',
-    'user_consent': '{{template_config.cookies.user_consent}}'
+    'app_session':    '{{template_config.cookies.app_session}}',
+    'user_session':   '{{template_config.cookies.user_session}}',
+    'user_state':     '{{template_config.cookies.user_state}}',
+    'user_consent':   '{{template_config.cookies.user_consent}}',
+    'user_translate': '{{template_config.cookies.user_translate}}'
   };
   var user_session = {
     'mode':                 'web',
@@ -238,6 +239,9 @@ var j1 = (function () {
     'theme_author':         '',
     'theme_version':        '{{template_version}}',
     'session_active':       false,
+    'google_translate':     'disabled',
+    'translate_all_pages':  true,
+    'translate_locale':     navigator.language || navigator.userLanguage,
     'last_session_ts':      ''
   };
   var user_consent = {};
@@ -287,14 +291,12 @@ var j1 = (function () {
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
-      var settings = $.extend(
-        {
-          foo: 'foo_option',
-          bar: 'bar_option'
+      var settings = $.extend({
+        foo: 'foo_option',
+        bar: 'bar_option'
         },
         options
       );
-
       // -----------------------------------------------------------------------
       // status settings
       // save status into the adapter object for (later) global access
@@ -322,7 +324,7 @@ var j1 = (function () {
           user_state.session_active     = false;
           user_state.last_session_ts    = timestamp_now;
 
-          if (!user_consent.analyses || !user_consent.personalization)  {
+          if (!user_consent.analysis || !user_consent.personalization)  {
             // rewrite consent|state cookies to session
             logger.debug('\n' + 'write to cookie : ' + cookie_names.user_consent);
             cookie_written = j1.writeCookie({
@@ -344,7 +346,7 @@ var j1 = (function () {
               expires:  0
             });
             if (!cookie_written) {
-            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+                logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
             }
           } else {
             logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
@@ -356,7 +358,7 @@ var j1 = (function () {
               expires:  365
             });
             if (!cookie_written) {
-            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+                logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
             }
           }
         } else {
@@ -382,7 +384,7 @@ var j1 = (function () {
                             expires:  0
                           });
       if (!cookie_written) {
-      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+        logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
       }
 
       user_state    =  j1.existsCookie(cookie_names.user_state)
@@ -395,7 +397,7 @@ var j1 = (function () {
                             expires:  365
                           });
       if (!cookie_written) {
-      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+        logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
       }
 
       // jadams, 2021-07-11: Found situation that user_state NOT initialized
@@ -412,7 +414,7 @@ var j1 = (function () {
         user_state.session_active = true;
       }
 
-      if (!user_consent.analyses || !user_consent.personalization)  {
+      if (!user_consent.analysis || !user_consent.personalization)  {
         // rewrite consent|state cookies to session
         logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
         cookie_written = j1.writeCookie({
@@ -423,7 +425,7 @@ var j1 = (function () {
           expires:  0
         });
         if (!cookie_written) {
-        	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+            logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
         }
       } else {
         logger.debug('\n' + 'write to cookie : ' + cookie_names.user_state);
@@ -435,10 +437,61 @@ var j1 = (function () {
           expires:  365
         });
         if (!cookie_written) {
-        	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
+            logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_state);
         }
       }
 
+      // initialize event handler for smooth scroll on in-page anchors
+      // -----------------------------------------------------------------------
+      $('a[href*=\\#]').on('click', function (event) {
+        // ignore void links
+        if (window.location.href.includes('#void')||this.href.includes('#void')) {
+          return false;
+        }
+        // for external links, redirect to this page
+        if (window.location.pathname !== this.pathname) {
+          window.location.href = this.href;
+        } else {
+          // continue on in-page anchor
+          var toccerScrollDuration  = 300;
+          var toccerScrollOffset    = 10;
+
+          // calculate offset value for correct (smooth) scroll position
+          //
+          var $pagehead       = $('.attic');
+          var $navbar         = $('nav.navbar');
+          var $adblock        = $('#adblock');
+          var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+          var fontSize        = $('body').css('font-size').replace('px','');
+          var start           = window.pageYOffset;
+          var l               = parseInt(fontSize);
+          var h               = $pagehead.length ? $pagehead.height() : 0;
+          var n               = $navbar.length ? $navbar.height() : 0;
+          var a               = $adblock.length ? $adblock.height() : 0;
+          var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+          // TODO:  to be checked why this static offset (toccerScrollOffset)
+          //        is needed
+          scrollOffset        = scrollOffset + toccerScrollOffset;
+
+          logger.debug('\n' + 'scroll to anchor: ' + this.hash);
+          $("html, body").animate({
+            scrollTop: $($(this).attr("href")).offset().top + scrollOffset + "px"
+          }, {
+            duration: toccerScrollDuration,
+            easing: "swing"
+          });
+          // disable bubble up the event
+          return false;
+        } // End in-page link
+      }); // END click event on anchors
+
+      // initialize event handler for window/history/back on <ESC>
+      // -----------------------------------------------------------------------
+      window.onkeyup = function (event) {
+        if (event.keyCode == 27) window.history.back();
+      };
+
       // detect middleware (mode 'app') and update user session cookie
       // -----------------------------------------------------------------------
       if (user_session.mode === 'app') {
@@ -473,7 +526,7 @@ var j1 = (function () {
           });
 
           if (!cookie_written) {
-          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+            logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
           }
 
           j1.setState(curr_state);
@@ -499,7 +552,7 @@ var j1 = (function () {
                 clearInterval(dependencies_met_page_displayed);
               }
             }
-          }, 25); // END dependencies_met_page_displayed
+          }, 25);
         })
         .catch(function(error) {
           // jadams, 2018-08-31: Why a hell a setTimeout is needed ???
@@ -521,14 +574,15 @@ var j1 = (function () {
               expires:  0
             });
             if (!cookie_written) {
-            	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+                logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
             }
 
             j1.setState(curr_state);
             logger.info('\n' + 'state: ' + j1.getState());
           }, detectTimeout);
         });
-      } else { // web mode
+      } else {
+        // web mode
         state = 'started';
         logger.info('\n' + 'state: ' + state);
         logger.info('\n' + 'page is being initialized');
@@ -584,7 +638,7 @@ var j1 = (function () {
       });
 
       if (!cookie_written) {
-      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+        logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
       }
 
       // NOTE: asynchronous calls should be rewitten to xhrData
@@ -607,7 +661,7 @@ var j1 = (function () {
         expires:  0
       });
       if (!cookie_written) {
-      	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+        logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
       }
 
       // -----------------------------------------------------------------------
@@ -617,9 +671,7 @@ var j1 = (function () {
 
       // finalize and display page
       j1.displayPage();
-
-    }, // END init
-
+    },
     // -------------------------------------------------------------------------
     // initBanner()
     // AJAX fetcher to load and place all banner used for a page
@@ -718,15 +770,14 @@ var j1 = (function () {
             var banner_data_path = '{{banner_data_path}} ' + id;
             selector.load(banner_data_path, cb_load_closure(id));
           }
-        } // END for
+        }
       }  else {
         logText = '\n' + 'no banner found in site';
         logger.warn(logText);
         return false;
       }
       return true;
-    }, // END initBanner
-
+    },
     // -------------------------------------------------------------------------
     // initPanel()
     // AJAX fetcher to load and place all panel used for a page
@@ -821,15 +872,14 @@ var j1 = (function () {
             var panel_data_path = '{{panel_data_path}} ' + id;
             selector.load(panel_data_path, cb_load_closure(id));
           }
-        } // END for
+        }
       } else {
         logText = '\n' + 'no panel found in site';
         logger.warn(logText);
         return false;
       }
       return true;
-    }, // END initPanel
-
+    },
     // -------------------------------------------------------------------------
     // initFooter()
     // AJAX fetcher to load and place the footer used for a page
@@ -882,8 +932,7 @@ var j1 = (function () {
         return false;
       }
       return true;
-    }, // END initFooter
-
+    },
     // -------------------------------------------------------------------------
     // displayPage
     // show the page after timeout of {{flickerTimeout}} ms
@@ -904,6 +953,7 @@ var j1 = (function () {
       var user_session        = j1.readCookie(cookie_names.user_session);
       var user_state          = j1.readCookie(cookie_names.user_state);
       var user_consent        = j1.readCookie(cookie_names.user_consent);
+      var user_translate      = j1.readCookie(cookie_names.user_translate);
       var current_url         = new liteURL(window.location.href);
       var providerPermissions = {};
       var provider;
@@ -958,7 +1008,7 @@ var j1 = (function () {
             expires:  0
           });
           if (!cookie_written) {
-          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+            logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
           }
 
           providerPermissions = user_session.provider_permissions;
@@ -981,14 +1031,14 @@ var j1 = (function () {
               window.location.href = ep_page_validation;
               return false;
             }
-          } // END check protected pages
+          }
 
           // show the page delayed
           setTimeout (function() {
-
             // Manage providers for personalization OptIn/Out (Comments|Ads)
             if (!user_consent.personalization) {
               logger.warn('\n' + 'disable comment provider: ' + comment_provider);
+              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $('#leave-a-comment').remove();
               if (comment_provider === 'disqus') {
                 $('#dsq-count-scr').remove();
@@ -1016,29 +1066,35 @@ var j1 = (function () {
                   $('#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>');
                 }
-              } // END comments
-            } // END personalization
+              }
+            }
 
             // display page
            $('#no_flicker').css('display', 'block');
 
-           // initialize backdrops
-           j1.core.createDropCap();
+           // no dropcaps if translation enabled
+           if (user_translate.translationEnabled) {
+             logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
+             logger.warn('\n' + 'skipped processing of dropcaps');
+           } 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);
-              	}
+                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.analyses) {
-              logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analyses);
+            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) {
@@ -1047,7 +1103,7 @@ var j1 = (function () {
                 logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
               }
             } else {
-              logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
+              logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
             }
 
             // show|hide cookie icon (should MOVED to Cookiebar ???)
@@ -1090,12 +1146,13 @@ var j1 = (function () {
             }
 
             // jadams, 2021-07-25: hide|show themes menu on cookie consent
-            // (analyses|personalization) settings. BootSwatch is a 3rd party
+            // (analysis|personalization) settings. BootSwatch is a 3rd party
             // is using e.g GA. Because NO control is possible on 3rd parties,
             // for GDPR compliance, themes feature may disabled on
             // privacy settings
-            if (!user_consent.analyses || !user_consent.personalization)  {
+            if (!user_consent.personalization)  {
               logger.warn('\n' + 'disable themes feature because of privacy settings');
+              logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
               $("#themes_menu").hide();
             } else {
               $("#themes_menu").show();
@@ -1126,11 +1183,10 @@ var j1 = (function () {
             logger.info(logText);
             logText = '\n' + 'page finalized successfully';
             logger.info(logText);
-
           }, flickerTimeout);
-        }); // END APP mode
-      } else { // web mode
-        // show the page delayed
+        });
+      } else {
+        // web mode
         setTimeout (function() {
           j1.setState('finished');
           logger.info('\n' + 'state: finished');
@@ -1139,6 +1195,7 @@ var j1 = (function () {
           // Manage providers for personalization OptIn/Out (Comments|Ads)
           if (!user_consent.personalization) {
             logger.warn('\n' + 'disable comment provider: ' + comment_provider);
+            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $('#leave-a-comment').remove();
             if (comment_provider === 'disqus') {
               $('#dsq-count-scr').remove();
@@ -1166,25 +1223,32 @@ var j1 = (function () {
                 $('#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>');
               }
-            } // END comments
-          } // END personalization
+            }
+          }
 
           // display page
           $('#no_flicker').css('display', 'block');
 
           // Add minus icon for collapse element which is open by default
-        	$(".collapse.show").each(function(){
-        		$(this).prev(".card-header").addClass("highlight");
-        	});
+            $(".collapse.show").each(function(){
+                $(this).prev(".card-header").addClass("highlight");
+            });
 
-        	// Highlight open collapsed element
-        	$(".card-header .btn").click(function(){
-        		$(".card-header").not($(this).parents()).removeClass("highlight");
-        		$(this).parents(".card-header").toggleClass("highlight");
-        	});
+            // Highlight open collapsed element
+            $(".card-header .btn").click(function(){
+                $(".card-header").not($(this).parents()).removeClass("highlight");
+                $(this).parents(".card-header").toggleClass("highlight");
+            });
 
-          // initialize backdrops
-          j1.core.createDropCap();
+            // no dropcaps if translation enabled
+            if (user_translate.translationEnabled) {
+              logger.info('\n' + 'translation enabled: ' + user_translate.translationEnabled);
+              logger.warn('\n' + 'skipped processing of dropcaps');
+            } 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') {
@@ -1195,11 +1259,10 @@ var j1 = (function () {
                }
              }, 25);
            }
-
           // NOTE: Placed tracking warning/info here because page may reloaded
           // after cookie consent selection
-          if (user_consent.analyses) {
-            logger.info('\n' + 'tracking allowed, privacy settings for analysis: ' + user_consent.analyses);
+          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) {
@@ -1208,7 +1271,7 @@ var j1 = (function () {
               logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
             }
           } else {
-            logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
+            logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analysis);
           }
 
           logger.info('\n' + 'mode detected: web');
@@ -1225,7 +1288,7 @@ var j1 = (function () {
               expires:  0
           });
           if (!cookie_written) {
-          	logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
+            logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_session);
           }
 
           // show|hide translator icon (currently NOT supported)
@@ -1252,12 +1315,13 @@ var j1 = (function () {
           }
 
           // jadams, 2021-07-25: hide|show themes menu on cookie consent
-          // (analyses|personalization) settings. BootSwatch is a 3rd party
+          // (analysis|personalization) settings. BootSwatch is a 3rd party
           // is using e.g GA. Because NO control is possible on 3rd parties,
           // for GDPR compliance, themes feature may disabled on
           // privacy settings
-          if (!user_consent.analyses || !user_consent.personalization)  {
+          if (!user_consent.personalization)  {
             logger.warn('\n' + 'disable themes feature because of privacy settings');
+            logger.warn('\n' + 'personalization not allowed, privacy settings for personalization: ' + user_consent.personalization);
             $("#themes_menu").hide();
           } else {
             $("#themes_menu").show();
@@ -1288,12 +1352,9 @@ var j1 = (function () {
           logger.info(logText);
           logText = '\n' + 'page finalized successfully';
           logger.info(logText);
-
-//        }, flickerTimeout);
-        }, 500);
-      } // END WEB mode
-    }, // END displayPage
-
+        }, flickerTimeout);
+      }
+    },
     // -------------------------------------------------------------------------
     // Helper functions
     // -------------------------------------------------------------------------
@@ -1313,16 +1374,14 @@ var j1 = (function () {
         }
       }
       return o;
-    },  // END mergeData
-
+    },
     // -------------------------------------------------------------------------
     // getPrevPage()
     // Returns the last vistited page
     // -------------------------------------------------------------------------
     getPrevPage: function () {
       return previous_page;
-    }, // END getPrevPage
-
+    },
     // -------------------------------------------------------------------------
     // getLanguage()
     // Returns the preferred language taken form window.navigator
@@ -1331,16 +1390,14 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     getLanguage: function () {
       var language = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage);
-    }, // END getLanguage
-
+    },
     // -------------------------------------------------------------------------
     // getTemplateVersion()
     // Returns the template version taken from site config (_config.yml)
     // -------------------------------------------------------------------------
     getTemplateVersion: function () {
       return '{{template_version}}';
-    }, // END getTemplateVersion
-
+    },
     // -------------------------------------------------------------------------
     // scrollTo()
     // Scrolls smooth to any anchor referenced by an page URL on
@@ -1353,6 +1410,12 @@ var j1 = (function () {
       var isSlider  = false;
       var selector;
 
+      if (typeof anchor === 'undefined') {
+        return false;
+      } else if (anchor.includes("googtrans")) {
+        return false;
+      }
+
       var logger        = log4javascript.getLogger('j1.scrollTo');
 
       var toccerScrollDuration = {{toccer_options.scrollSmoothDuration}};
@@ -1399,15 +1462,14 @@ var j1 = (function () {
           //
           $(window).scrollTop($(window).scrollTop()+1);
           $(window).scrollTop($(window).scrollTop()-1);
-        } // END if anchor_id
+        }
       } else if (anchor_id === '#') {
         logger.info('\n' + 'bound click event to "#", suppress default action');
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
         return false;
       }
-    }, // END scrollTo
-
+    },
     // -------------------------------------------------------------------------
     //  authEnabled()
     //  Returns the state of the authentication module
@@ -1417,8 +1479,7 @@ var j1 = (function () {
       var authEnabled = {{authentication_options.j1_auth.enabled}};
 
       return authEnabled;
-    }, // END authEnabled
-
+    },
     // -------------------------------------------------------------------------
     //  appDetected()
     //  Returns true if a web session cookie exists
@@ -1436,8 +1497,7 @@ var j1 = (function () {
         detected = false;
       }
       return detected;
-    }, // END appDetected
-
+    },
     // -------------------------------------------------------------------------
     // loadHTML()
     // Load HTML data asychronously using XHR|jQuery on an element (e.g. <div>)
@@ -1543,8 +1603,7 @@ var j1 = (function () {
         }
       }
       return state;
-    }, // END loadHTML
-
+    },
     // -------------------------------------------------------------------------
     // loadJS()
     // Load JS data asychronously using jQuery (XHR)
@@ -1582,8 +1641,24 @@ var j1 = (function () {
       });
 
       return state;
-    }, // END loadJS
+    },
+    // -------------------------------------------------------------------------
+    // removeRessource (Vanilla JS)
+    // -------------------------------------------------------------------------
+    removeRessource: function (filename, filetype) {
+      // determine element type to create nodelist from
+      var targetelement=(filetype=="js")? "script" : (filetype=="css")? "link" : "none"
+      // determine corresponding attribute to test for
+      var targetattr=(filetype=="js")? "src" : (filetype=="css")? "href" : "none"
+      var allsuspects=document.getElementsByTagName(targetelement)
 
+      // search backwards within nodelist for matching elements to remove
+      // remove element by calling parentNode.removeChild()
+      for (var i=allsuspects.length; i>=0; i--) {
+        if (allsuspects[i] && allsuspects[i].getAttribute(targetattr)!=null && allsuspects[i].getAttribute(targetattr).indexOf(filename)!=-1)
+            allsuspects[i].parentNode.removeChild(allsuspects[i])
+      }
+    },
     // -------------------------------------------------------------------------
     //  readCookie (Vanilla JS)
     // -------------------------------------------------------------------------
@@ -1604,8 +1679,7 @@ var j1 = (function () {
       } else {
         return false;
       }
-    }, // END readCookie
-
+    },
     // -------------------------------------------------------------------------
     // writeCookie (Cookie lib)
     // Write 'data' to a cookie 'name'. If not exists, the cookie gets
@@ -1698,8 +1772,7 @@ var j1 = (function () {
         return false;
       }
 
-    }, // END writeCookie
-
+    },
     // -------------------------------------------------------------------------
     // findCookie (Vanilla JS)
     // Search for cookies (names) in the page header that matches a given
@@ -1714,8 +1787,7 @@ var j1 = (function () {
       document.cookie.replace(new RegExp(name + '[^= ]*', 'g'), function(a){ rCookie.push(a.trim()); });
 
       return rCookie;
-    }, // END findCookie
-
+    },
     // -------------------------------------------------------------------------
     // removeCookie (Vanilla JS)
     // -------------------------------------------------------------------------
@@ -1734,8 +1806,7 @@ var j1 = (function () {
       } else {
         return false;
       }
-    }, // END removeCookie
-
+    },
     // -------------------------------------------------------------------------
     // expireCookie (Vanilla JS)
     // Expires given cookies by name except cookies set to httpOnly. For all
@@ -1796,8 +1867,7 @@ var j1 = (function () {
       }
 
       return true;
-    }, // END expireCookie
-
+    },
     // -------------------------------------------------------------------------
     // existsCookie (Vanilla JS)
     // returns true if a given cookie exists
@@ -1831,8 +1901,7 @@ var j1 = (function () {
       cookieExists  = cookieContent.length ? true : false;
 
       return cookieExists;
-    }, // END existsCookie
-
+    },
     // -------------------------------------------------------------------------
     // Resolve MACROs
     //
@@ -1908,9 +1977,8 @@ var j1 = (function () {
             return false;
           }
         }
-      }, 25); // END 'sidebarLoaded'
-    }, // END resolveMacros
-
+      }, 25);
+    },
     // -------------------------------------------------------------------------
     // Update MACROs
     // Update the values, NOT the placeholders
@@ -1966,9 +2034,8 @@ var j1 = (function () {
             return false;
           }
         }
-      }, 25); // END 'sidebarLoaded'
-    }, // END updateMacros
-
+      }, 25);
+    },
     // -------------------------------------------------------------------------
     // getMessage
     // Get a log message from the log message catalog object
@@ -1977,8 +2044,7 @@ var j1 = (function () {
       var message = j1.messages[level][message]['message'][property];
 
       return message;
-    }, // END getMessage
-
+    },
     // -------------------------------------------------------------------------
     // logger
     // Log a message
@@ -1989,8 +2055,7 @@ var j1 = (function () {
       logger[level](message);
 
       return true;
-    }, // END logger
-
+    },
     // -------------------------------------------------------------------------
     // Send message
     // -------------------------------------------------------------------------
@@ -2010,8 +2075,7 @@ var j1 = (function () {
         executeFunctionByName(receiver + '.messageHandler', window, sender, message);
       }
 
-    }, // END sendMessage
-
+    },
     // -------------------------------------------------------------------------
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
@@ -2036,8 +2100,7 @@ var j1 = (function () {
       //
 
       return true;
-    }, // END messageHandler
-
+    },
     // -------------------------------------------------------------------------
     // getStyleValue:
     // Returns the value of a style from a css class definition
@@ -2057,8 +2120,7 @@ var j1 = (function () {
       document.body.removeChild(testElement);
 
       return val;
-    }, // END getStyleValue
-
+    },
     // -------------------------------------------------------------------------
     // getStyleSheetLoaded:
     // NOTE:
@@ -2075,14 +2137,12 @@ var j1 = (function () {
         }
       }
     },
-
     // -------------------------------------------------------------------------
     //  Returns the names of cookies used for J1 Template
     // -------------------------------------------------------------------------
     getCookieNames: function () {
       return cookie_names;
-    }, // end getCookieNames
-
+    },
     // -------------------------------------------------------------------------
     // Set dynamic styles
     // -------------------------------------------------------------------------
@@ -2146,40 +2206,35 @@ var j1 = (function () {
       // $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
 
       return true;
-    }, // END setCss
-
+    },
     // -------------------------------------------------------------------------
     // setState()
     // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
       state = stat;
-    }, // end setState
-
+    },
     // -------------------------------------------------------------------------
     // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
       return state;
-    }, // end getState
-
+    },
     // -------------------------------------------------------------------------
     // setXhrDataState()
     // Set the final (loading) state of an element (partial) loaded via Xhr
     // -------------------------------------------------------------------------
     setXhrDataState: function (obj, stat) {
       j1.xhrDataState[obj] = stat;
-    }, // END setXhrDataState
-
+    },
     // -------------------------------------------------------------------------
     // getXhrDataState()
     // Returns the final (loading) state of an element (partial) loaded via Xhr
     // -------------------------------------------------------------------------
     getXhrDataState: function (obj) {
       return j1.xhrDataState[obj];
-    }, // END getXhrDataState
-
+    },
     // -------------------------------------------------------------------------
     // setXhrDomState()
     // Set the state of an element loaded via Xhr that is
@@ -2187,8 +2242,7 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     setXhrDomState: function (obj, stat) {
       j1.xhrDOMState[obj] = stat;
-    }, // END setXhrDomState
-
+    },
     // -------------------------------------------------------------------------
     // getXhrDataState()
     // Returns the state of an element loaded via Xhr that is
@@ -2196,24 +2250,21 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     getXhrDOMState: function (obj) {
       return j1.xhrDOMState[obj];
-    }, // END getXhrDOMState
-
+    },
     // -------------------------------------------------------------------------
     // setMode()
     // Set the current mode of the site (web|app)
     // -------------------------------------------------------------------------
     setMode: function (mod) {
       mode = mod;
-    }, // END setMode
-
+    },
     // -------------------------------------------------------------------------
     // getMode()
     // Returns the current mode of the site (web|app)
     // -------------------------------------------------------------------------
     getMode: function () {
       return mode;
-    }, // END getMode
-
+    },
     // -------------------------------------------------------------------------
     // checkUserAgent()
     // Returns the name (UA) of the web browser
@@ -2224,8 +2275,7 @@ var j1 = (function () {
       } else {
         return false;
       }
-    }, // END checkUserAgent
-
+    },
     // -------------------------------------------------------------------------
     // generateId()
     // Generate a unique (thread) id used by the logger
@@ -2238,24 +2288,21 @@ var j1 = (function () {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
      }
      return result;
-    }, // END generateId
-
+    },
     // -------------------------------------------------------------------------
     // getTrue()
     // Returns always true (for testing purposes)
     // -------------------------------------------------------------------------
     getTrue: function () {
       return true;
-    }, // END isTrue
-
+    },
     // -------------------------------------------------------------------------
     // getFalse()
     // Returns always false (for testing purposes)
     // -------------------------------------------------------------------------
     getFalse: function () {
       return false;
-    }, // END isTrue
-
+    },
     // -------------------------------------------------------------------------
     // goHome()
     // Redirect current page to the browser homepage
@@ -2270,8 +2317,7 @@ var j1 = (function () {
       } else {
         window.location.href = 'about:blank';
       }
-    }, // END gohome
-
+    },
     // -------------------------------------------------------------------------
     // goBack()
     // Redirect current page to last visited page (referrer)
@@ -2279,9 +2325,8 @@ var j1 = (function () {
     goBack: function () {
       // where visitor has come from
       window.location.href = document.referrer;
-    } // END goBack
-
-  }; // END j1 (return)
+    }
+  };
 }) (j1, window);
 
 {% comment %} NOTE: Unexpected token: punc (;) errors if compressed