j1-template 2023.7.0 → 2023.8.1

data/_includes/themes/j1/procedures/global/set_base_vars_folders.proc

@@ -16,11 +16,11 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% comment %} liquid procedures 
+{% comment %} Liquid procedures
 jadams, 2019-08-23: no procedures should be used for initial setup
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} set base config files and folders
+{% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign data                = site.data %}
 {% assign apps                = data.apps %}
@@ -31,7 +31,5 @@ jadams, 2019-08-23: no procedures should be used for initial setup
 {% assign pages               = data.pages %}
 {% assign tables              = data.tables %}
 
-{% comment %} set base variables
--------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
 {% assign template_name       = site.template.name %}

data/_includes/themes/j1/procedures/global/set_image_block.proc

@@ -29,15 +29,17 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
-   ------------------------------------------------------------ {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign image_name  = include.image_name %}
 {% assign image_title = include.image_title %}
 {% assign image_width = include.image_width %}
 
 
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
 [subs=attributes]
 ++++
 <div class="imageblock mt-4 mb-4">

data/_includes/themes/j1/procedures/global/setup.proc

@@ -16,11 +16,16 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% comment %} liquid procedures 
+{% comment %} Liquid procedures
 jadams, 2019-08-23: no procedures should be used for initial setup
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} main (???)
+{% comment %} Variables
+jadams, 2019-08-23: no variables should be used for initial setup
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
+{% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if site.template.setup_provider == "custom" %}
   {% include custom/functions/setup %}
@@ -50,4 +55,4 @@ jadams, 2019-08-23: no procedures should be used for initial setup
   {% else %}
     {% capture image_path %}{{ base_path }}/assets/images/{{ page.theme.name }}{% endcapture %}
   {% endif %}
-{% endif %}
+{% endif %}

data/assets/data/masonry.html

@@ -144,7 +144,7 @@ exclude_from_search:                    true
               ------------------------------------------------------------------ {% endcomment %}
               {% for category in categories %}
               {% if category contains post.category %}
-              <a  class="article-link d-block text-white text-uppercase link-no-decoration {{translate}}"
+              <a  class="masonry-article-link d-block text-white text-uppercase link-no-decoration {{translate}}"
                   href="/pages/public/blog/navigator/archive/categoryview/#{{grid.group | slugify}}"
                   target="{{target}}"
                   style="font-size: 32px;">
@@ -166,7 +166,7 @@ exclude_from_search:                    true
 
               <!-- Post link (caption) -->
               <h4 class="caption notoc">
-                <a class="article-link {{translate}}"
+                <a class="masonry-article-link {{translate}}"
                    href="{{post.url}}"
                    target="{{target}}"
                    style="font-size: 32px;">
@@ -233,12 +233,12 @@ exclude_from_search:                    true
 
       {% for article in articles %}
       <div class="col-xl-{{masonry_options.responsive.xl}} col-lg-{{masonry_options.responsive.lg}} col-md-{{masonry_options.responsive.md}} col-sm-{{masonry_options.responsive.sm}} col-{{masonry_options.responsive.xs}} px-{{gutter}} py-{{gutter}}">
-        <!-- Article item -->
-        <div id="{{article.title | downcase | replace: ' ' ,'_'}}" class="article-item article-item--w400">
+        <!-- (Masonry) Article item -->
+        <div id="{{article.title | downcase | replace: ' ' ,'_'}}" class="masonry-article-item masonry-article-item--w400">
           {% if grid.preview %}
-          <a class="article-link" data-bs-toggle="modal" href="#articleModal_{{grid.id}}_{{forloop.index}}">
-            <div class="article-hover">
-              <div class="article-hover-content">
+          <a class="masonry-article-link" data-bs-toggle="modal" href="#articleModal_{{grid.id}}_{{forloop.index}}">
+            <div class="masonry-article-hover">
+              <div class="masonry-article-hover-content">
                 <i class="mdib mdib-plus mdib-10x"></i>
               </div>
             </div>
@@ -247,14 +247,14 @@ exclude_from_search:                    true
           {% else %}
             <img class="{{grid.image_styles}}" src="{{article.image.path}}" alt="{{article.title}}" style="{{image_filters}}; height: {{grid.image_height}}; width: {{grid.image_width}}">
           {% endif %}
-          <div class="article-caption">
-            <div class="article-caption-heading">
-              <a class="article-link {{translate}}" href="{{article.url}}">{{article.title}}</a>
+          <div class="masonry-article-caption">
+            <div class="masonry-article-caption-heading">
+              <a class="masonry-article-link {{translate}}" href="{{article.url}}" target="{{target}}">{{article.title}}</a>
             </div>
-            <div class="article-caption-subheading text-muted">{{article.tags[0]}}</div>
+            <div class="masonry-article-caption-subheading">{{article.tags[0]}}</div>
           </div>
         </div>
-        <!-- /Article item -->
+        <!-- /(Masonry) Article item -->
       </div>
 
       <!-- Article Modal-->
@@ -273,7 +273,7 @@ exclude_from_search:                    true
                   <div class="modal-body">
                     <!-- Project details-->
                     <h2 class="text-uppercase notoc {{translate}}">{{article.title}}</h2>
-                    <p class="item-intro text-muted">{{article.tagline}}</p>
+                    <p class="item-intro">{{article.tagline}}</p>
                     <img class="img-fluid d-block mx-auto" src="{{article.image.path | relative_url}}" alt="{{article.title}}">
                     <p>{{article.description}}</p>
                     <ul class="list-inline">

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

@@ -513,7 +513,9 @@ var j1 = (function (options) {
               var footer_state;
 
               if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+                clearInterval(dependencies_met_page_ready);
                 logger.info('\n' + 'load block elements');
+
                 if (banners_exits) {j1.initBanner(settings);}
                 if (panels_exists) {j1.initPanel(settings)};
                 if (footer_exists) {j1.initFooter(settings);}
@@ -559,34 +561,21 @@ var j1 = (function (options) {
 
                     // show the content section for 'block content' to optimze CLS
                     //
-                    if (banner_state == 'success' && panel_state == 'success' && footer_state == 'success') {
+//                  if (banner_state == 'success' && panel_state == 'success' && footer_state == 'success') {
+                    if (banner_state == 'success' && panel_state == 'success') {
                       // show the content|footer
                       //
                       $('#content').show();
                       $('.{{footer}}').show();
 
-                      clearInterval(dependencies_met_page_ready);
+//                    clearInterval(dependencies_met_page_ready);
                       clearInterval(dependencies_met_blocks_ready);
                     }
                   }, 10);
                 } else {
                   // pages w/o banners or panels
-
-                  if (footer_exists) {
-                    footer_state = j1.getXhrDataState('#{{footer_id}}');
-                  } else {
-                    // pages w/o footer
-                    footer_state = 'success';
-                  }
-
-                  // show the content|footer
-                  //
-                  if ( footer_state == 'success') {
-                    $('#content').show();
-                    $('.{{footer}}').show();
-
-                    clearInterval(dependencies_met_page_ready);
-                  }
+                  $('#content').show();
+                  $('.{{footer}}').show();
                 }
               }
             }, 10);
@@ -671,15 +660,18 @@ var j1 = (function (options) {
         var footer_state;
 
         if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+          clearInterval(dependencies_met_page_ready);
           logger.info('\n' + 'load block elements');
+
           if (banners_exits) {j1.initBanner(settings);}
           if (panels_exists) {j1.initPanel(settings)};
           if (footer_exists) {j1.initFooter(settings);}
 
+          // process pages having banners or panels
+          //
           if (banner_blocks || panel_blocks) {
-            // pages having banners or panels
-
             var dependencies_met_blocks_ready = setInterval (function (settings) {
+              // check the footer if HTML portion is loaded successfully
               if (footer_exists) {
                 footer_state = j1.getXhrDataState('#{{footer_id}}');
               } else {
@@ -687,7 +679,7 @@ var j1 = (function (options) {
                 footer_state = 'success';
               }
 
-              // check bannern if HTML content loaded successfully
+              // check bannern if HTML content is loaded successfully
               //
               if (banners_exits) {
                 Object.entries(j1.xhrDataState).forEach(entry => {
@@ -701,7 +693,7 @@ var j1 = (function (options) {
                 banner_state = 'success';
               }
 
-              // check panels if HTML content loaded successfully
+              // check panels if HTML content is loaded successfully
               //
               if (panels_exists)  {
                 Object.entries(j1.xhrDataState).forEach(entry => {
@@ -715,7 +707,7 @@ var j1 = (function (options) {
                 panel_state = 'success';
               }
 
-              // show the content section for 'block content' to optimze CLS
+              // show the content section if block content is available (CLS optimization)
               //
               if (banner_state == 'success' && panel_state == 'success' && footer_state == 'success') {
                 // show the content|footer
@@ -723,28 +715,32 @@ var j1 = (function (options) {
                 $('#content').show();
                 $('.{{footer}}').show();
 
-                clearInterval(dependencies_met_page_ready);
                 clearInterval(dependencies_met_blocks_ready);
               }
             }, 10);
           } else {
-            // pages w/o banners or panels
-
-            if (footer_exists) {
-              footer_state = j1.getXhrDataState('#{{footer_id}}');
-            } else {
-              // pages w/o footer
-              footer_state = 'success';
-            }
-
-            // show the content|footer
+            // process pages w/o banners or panels
             //
-            if ( footer_state == 'success') {
-              $('#content').show();
-              $('.{{footer}}').show();
+            var dependencies_met_footer_block_ready = setInterval (function (settings) {
+              // check the footer if HTML portion is loaded successfully
+              if (footer_exists) {
+                footer_state = j1.getXhrDataState('#{{footer_id}}');
+              } else {
+                // pages w/o footer
+                footer_state = 'success';
+              }
 
-              clearInterval(dependencies_met_page_ready);
-            }
+              // show the content section if footer is available (CLS optimization)
+              //
+              if (footer_state == 'success') {
+                // show the content|footer
+                //
+                $('#content').show();
+                $('.{{footer}}').show();
+
+                clearInterval(dependencies_met_footer_block_ready);
+              }
+            }, 10);
           }
         }
       }, 10);
@@ -871,6 +867,8 @@ var j1 = (function (options) {
             logger.info(logText);
             var banner_data_path = '{{banner_data_path}} ' + id + '_content';
             selector.load(banner_data_path, cb_load_closure(id));
+          } else {
+            continue;
           }
         }
       }  else {
@@ -974,6 +972,8 @@ var j1 = (function (options) {
             logger.info(logText);
             var panel_data_path = '{{panel_data_path}} ' + id + '_content';
             selector.load(panel_data_path, cb_load_closure(id));
+          } else {
+            continue;
           }
         }
       } else {

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

@@ -166,8 +166,9 @@ j1.adapter.masterslider = (function (j1, window) {
       var dependencies_met_module_finished = setInterval(function() {
         var contentState    = $('#content').css("display");
         var contentVisible  = (contentState == 'block') ? true: false;
+        var atticFinished   = (j1.adapter.attic.getState() == 'finished') ? true: false;
 
-        if (_this.getState() == 'sliders_initialized' && contentVisible) {
+        if (_this.getState() == 'sliders_initialized' && contentVisible && atticFinished) {
             // TODO: Check why a timeout is required to load the Slider Manager
             setTimeout (function() {
               if (sliderManager) document.body.appendChild(msSliderManager);

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

@@ -257,17 +257,20 @@ j1.adapter.slick = (function (j1, window) {
                   });
                 } // END carousel lightbox enabled
 
-                logger.info('\n' + 'adjust positions of arrows on id: {{carousel.id}}');
+                logger.info('\n' + 'adjust positions of slick lightbox arrows on id: {{carousel.id}}');
                 var buttons = $("#{{carousel.id}} > button");
+                var arrowTopPos = Math.round(document.documentElement.clientHeight/2)
 
-                // recalculate right arrow position based on gutter settings
+                // jadams, 2023-09-01: not used anymore
                 //
-                var percentage_right = 3 + carouselSettings.gutters;
-                $.each($(buttons), function(index, button) {
-                  if (button.textContent.includes("Next")) {
-                    $(button).attr('style','right: ' + percentage_right + '%');
-                  }
-                });
+                // re-calculate right arrow position based on gutter settings
+                // var percentage_right = 3 + carouselSettings.gutters;
+                // $.each($(buttons), function(index, button) {
+                //
+                //   if (button.textContent.includes("Next")) {
+                //     $(button).attr('style', 'right: ' + percentage_right + '%');
+                //   }
+                // });
 
                 // add CSS style for individual top position for all carousels
                 //
@@ -310,9 +313,9 @@ j1.adapter.slick = (function (j1, window) {
                     const $currentSlide = $slides.filter((index, slide) => $(slide).hasClass('slick-current'));
 
                     if (carousel_type == 'example') {
-                      slideImageHeight = ($currentSlide.find('{{carousel.style}}').height() / 2) - 25;
+                      slideImageHeight = ($currentSlide.find('{{carousel.style}}').height()/2) - 25;
                     } else {
-                      slideImageHeight = ($currentSlide.find('img').height() / 2) - 20;
+                      slideImageHeight = ($currentSlide.find('img').height()/2) - 25;
                     }
 
                     logger.info('\n' + 'adjust top arrow position (centered) by ' + slideImageHeight + ' on id: {{carousel.id}}');

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

@@ -55,7 +55,6 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/translator.js
@@ -104,6 +103,7 @@ j1.adapter.translator = (function (j1, window) {
   var hostname;
   var domain;
   var subDomain;
+  var isSubDomain;
   var cookie_option_domain;
   var secure;
   var logText;
@@ -145,12 +145,12 @@ j1.adapter.translator = (function (j1, window) {
       translatorDefaults    = $.extend({},   {{translator_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
       translatorSettings    = $.extend({},   {{translator_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
       translatorOptions     = $.extend(true, {}, translatorDefaults, translatorSettings);
-
       url                   = new liteURL(window.location.href);
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      subDomain             = j1.subdomain(hostname);
+      subDomain             = '.' + domain;
+      isSubDomain           = j1.subdomain(hostname);
       secure                = (url.protocol.includes('https')) ? true : false;
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
@@ -197,9 +197,10 @@ j1.adapter.translator = (function (j1, window) {
         var option_domain = '{{cookie_options.domain}}';
         var translationFeedbackHighlight;
 
-        user_consent      = j1.readCookie(cookie_names.user_consent);
+        user_consent = j1.readCookie(cookie_names.user_consent);
 
         // set domain used by cookies
+        //
         if (option_domain == 'auto') {
           domainAttribute = domain ;
         } else  {
@@ -208,16 +209,16 @@ j1.adapter.translator = (function (j1, window) {
 
         var pageState     = $('#no_flicker').css("display");
         var pageVisible   = (pageState == 'block') ? true: false;
-        var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
+        var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true : false;
 
-        if (j1.getState() === 'finished' && pageVisible) {
-//      if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+        if (j1.getState() === 'finished' && pageVisible && atticFinished) {
 
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
           // load|initialize user translate cookie
+          //
           if (j1.existsCookie(cookie_names.user_translate)) {
             user_translate = j1.readCookie(cookie_names.user_translate);
           } else {
@@ -232,21 +233,25 @@ j1.adapter.translator = (function (j1, window) {
           }
 
           // hide the google translate element if exists
+          //
           if ($('google_translate_element')) {
             $('google_translate_element').hide();
           }
 
           // show|hide translate button if enabled
+          //
           if (translatorOptions.hideTranslatorIcon) {
             if (!user_consent.analysis || !user_consent.personalization) {
               // disable google translate button if visible
+              //
               if ($('#quickLinksTranslateButton').css('display') === 'block')  {
                 logger.info('\n' + 'disable quickLinksTranslateButton');
                 $('#quickLinksTranslateButton').css('display', 'none');
               }
             }
             if (user_consent.analysis && user_consent.personalization) {
-              // enable google translate button if not visible
+              // enable google translate button if NOT visible
+              //
               if ($('#quickLinksTranslateButton').css('display') === 'none')  {
                 logger.info('\n' + 'enable quickLinksTranslateButton');
                 $('#quickLinksTranslateButton').css('display', 'block');
@@ -255,6 +260,7 @@ j1.adapter.translator = (function (j1, window) {
           }
 
           // load|set user translate cookie
+          //
           user_consent = j1.readCookie(cookie_names.user_consent);
           if (!user_consent.analysis || !user_consent.personalization) {
             // disable translation service
@@ -266,6 +272,7 @@ j1.adapter.translator = (function (j1, window) {
             });
 
             // expire permanent cookie to session
+            //
             j1.expireCookie({ name: cookie_names.user_translate });
           } else {
             logger.debug('\n' + 'write to cookie : ' + cookie_names.user_translate);
@@ -282,22 +289,22 @@ j1.adapter.translator = (function (j1, window) {
           }
 
           j1.translator = new Translator({
-            contentURL:               translatorOptions.contentURL,                 // dialog content (modals) for all supported languages
-            cookieName:               cookie_names.user_translate,              // name of the translator cookie
-            cookieStorageDays:        expires,                                  // lifetime of a cookie [0..365], 0: session cookie
-            cookieSameSite:           same_site,                                // restrict consent cookie
-            cookieDomain:             domainAttribute,                          // set domain (hostname|domain)
-            cookieSecure:             secure,                                   // set
-            cookieConsentName:        translatorOptions.cookieConsentName,          // the name of the Cookie Consent Cookie (secondary data)
-            disableLanguageSelector:  translatorOptions.disableLanguageSelector,    // disable language dropdown for translation in dialog (modal)
-            dialogContainerID:        translatorOptions.dialogContainerID,          // dest container, the dialog modal is loaded (dynamically)
-            dialogLanguage:           translatorOptions.dialogLanguage,             // language for the dialog (modal)
-            translationLanguage:      translatorOptions.translationLanguage,        // default language for translation
-            translationLanguages:     translatorOptions.google.translationLanguages,// supported languages for translation
-            translationEnabled:       translatorOptions.translationEnabled,         // run translation enabled|disabled
-            translatorName:           translatorOptions.translatorName,             // translator used for translation
-            xhrDataElement:           translatorOptions.xhrDataElement,             // container for all language-specific dialogs (modals)
-            postSelectionCallback:    translatorOptions.google.postSelectionCallback
+            contentURL:               translatorOptions.contentURL,                     // dialog content (modals) for all supported languages
+            cookieName:               cookie_names.user_translate,                      // name of the translator cookie
+            cookieStorageDays:        expires,                                          // lifetime of a cookie [0..365], 0: session cookie
+            cookieSameSite:           same_site,                                        // restrict consent cookie
+            cookieDomain:             domainAttribute,                                  // set domain (hostname|domain)
+            cookieSecure:             secure,                                           // set secure
+            cookieConsentName:        translatorOptions.cookieConsentName,              // the name of the Cookie Consent Cookie (secondary data)
+            disableLanguageSelector:  translatorOptions.disableLanguageSelector,        // disable language dropdown for translation in dialog (modal)
+            dialogContainerID:        translatorOptions.dialogContainerID,              // dest container, the dialog modal is loaded (dynamically)
+            dialogLanguage:           translatorOptions.dialogLanguage,                 // language for the dialog (modal)
+            translationLanguage:      translatorOptions.translationLanguage,            // default language for translation
+            translationLanguages:     translatorOptions.google.translationLanguages,    // supported languages for translation
+            translationEnabled:       translatorOptions.translationEnabled,             // run translation enabled|disabled
+            translatorName:           translatorOptions.translatorName,                 // translator used for translation
+            xhrDataElement:           translatorOptions.xhrDataElement,                 // container for all language-specific dialogs (modals)
+            postSelectionCallback:    translatorOptions.google.postSelectionCallback    // prepared but currently NOT actively used
           });
 
           // hide the translation feedback
@@ -319,22 +326,16 @@ j1.adapter.translator = (function (j1, window) {
               if ($('google_translate_element')) {
                 $('google_translate_element').hide();
               }
-              // if( $('#gt-callback').length ) {
-              //   logger.info('\n' + 'Google Translate Script already exists : ' + gtTranslateScript.id);
-              // } else {
-              //   logger.info('\n' + 'append Google Translate Script: ' + gtTranslateScript.id);
-              //   head.appendChild(gtTranslateScript);
-              //   if ($('google_translate_element')) {
-              //     $('google_translate_element').hide();
-              //   }
-              // }
             }
           } else {
             if (translatorOptions.translatorName === 'google') {
               logger.info('\n' + 'translation disabled');
               logger.info('\n' + 'remove existing Google Translate cookies');
+
               // remove all googtrans cookies that POTENTIALLY exists
+              //
               Cookies.remove('googtrans', { domain: domainAttribute });
+              Cookies.remove('googtrans', { domain: subDomain });
               Cookies.remove('googtrans', { domain: hostname });
               Cookies.remove('googtrans');
             }
@@ -351,6 +352,7 @@ j1.adapter.translator = (function (j1, window) {
           clearInterval(dependencies_met_page_ready);
         }
       }, 10);
+
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -398,12 +400,13 @@ j1.adapter.translator = (function (j1, window) {
 
     // -------------------------------------------------------------------------
     // postTranslateElementInit()
-    // ???
+    // prepared but currently NOT actively used
     // -------------------------------------------------------------------------
     postTranslateElementInit: function (response) {
       // code for post processing
       logger.info('\n' + 'postTranslateElementInit entered');
       logger.info('\n' + response.T.Dh);
+
       return;
     }, // END postTranslateElementInit
 
@@ -415,28 +418,16 @@ j1.adapter.translator = (function (j1, window) {
     cbGoogle: function (option) {
       var logger            = log4javascript.getLogger('j1.adapter.translator.cbGoogle');
       var msDropdown        = document.getElementById('dropdownJSON').msDropdown;
-
       var url               = new liteURL(window.location.href);
       var baseUrl           = url.origin;
       var hostname          = url.hostname;
-      var auto_domain       = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-      var subDomain         = j1.subdomain(hostname);
+      var domain            = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      var subDomain         = '.' + domain;
+      var isSubDomain       = j1.subdomain(hostname);
       var domainAttribute   = '';
-
-//    var cookie_names          = j1.getCookieNames();
-//    var user_consent          = j1.readCookie(cookie_names.user_consent);
-//    var user_translate        = j1.readCookie(cookie_names.user_translate);
-//    var url                   = new liteURL(window.location.href);
-//    var baseUrl               = url.origin;;
-//    var hostname              = url.hostname;
-//    var domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
-//    var cookie_option_domain  = '{{cookie_options.domain}}';
-//    var same_site             = '{{cookie_options.same_site}}';
-
       var srcLang;
       var destLang;
       var transCode;
-      var domainAttribute;
       var selectedTranslationLanguage;
 
       // set domain used by cookies
@@ -457,6 +448,7 @@ j1.adapter.translator = (function (j1, window) {
       logger.info('\n' + 'selected translation language: ' + selectedTranslationLanguage);
 
       // set content language
+      //
       if (translatorOptions.contentLanguage === 'auto') {
         srcLang = '{{contentLanguage}}';
       } else {
@@ -464,20 +456,26 @@ j1.adapter.translator = (function (j1, window) {
       }
 
       // translation language MUST be DIFFERENT from content language
+      //
       if (srcLang == selectedTranslationLanguage ) {
         // remove all googtrans cookies that POTENTIALLY exists
+        //
         Cookies.remove('googtrans', { domain: domainAttribute });
+        Cookies.remove('googtrans', { domain: subDomain });
         Cookies.remove('googtrans', { domain: hostname });
         Cookies.remove('googtrans');
         location.reload();
       }
 
       // set transCode settings
+      //
       destLang  = translation_language;
       transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
 
       // remove all googtrans cookies that POTENTIALLY exists
+      //
       Cookies.remove('googtrans', { domain: domainAttribute });
+      Cookies.remove('googtrans', { domain: subDomain });
       Cookies.remove('googtrans', { domain: hostname });
       Cookies.remove('googtrans');
 
@@ -487,18 +485,15 @@ j1.adapter.translator = (function (j1, window) {
       // in an empty field and two cookies (host+domain) if domain option
       // is enabled!!!
       // -----------------------------------------------------------------------
-
-      if (subDomain) {
-        Cookies.set('googtrans', transCode, { domain: auto_domain });
+      if (isSubDomain) {
+        Cookies.set('googtrans', transCode, { domain: domain });
       } else {
         Cookies.set('googtrans', transCode);
-//      Cookies.set('googtrans', transCode, { domain: hostname });
       }
 
-//    Cookies.set('googtrans', transCode);
+      // reload current page
+      location.reload();
 
-      // reload current page (skip cache)
-      location.reload(true);
     }, // END cbGoogle
 
     // -------------------------------------------------------------------------
@@ -508,12 +503,21 @@ j1.adapter.translator = (function (j1, window) {
     // -------------------------------------------------------------------------
     cbDeepl: function () {
       var logger     = log4javascript.getLogger('j1.adapter.translator.cbDeepl');
-      // code for post processing
+
+      //
+      // place code for processing here
+      //
+
     } // END cbDeepl
 
   }; // END return
+
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}