j1-template 2021.2.10 → 2021.3.1

data/assets/data/quicklinks.html

@@ -246,16 +246,16 @@ exclude_from_search:                    true
   {% if facebook_url !=
     "none" %}<li id="quickLinksFacebookButton" class="nav-item"><a id="facebook_id" class="nav-icon" href="{{facebook_url}}" aria-label="Facebook" target="blank"><i class="{{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if twitter_url != "none" %}<li id="quickLinksTwitterButton" class="nav-item"><a id="twitter_id" class="nav-icon" href="{{twitter_url}}" aria-label="Twitter" target="blank"><i class="{{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" aria-label="SignOut" href="#" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" aria-label="SignOut" href="#void" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_cookieconsent_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: block;"><a href="javascript:j1.cookieConsent.showDialog()" aria-label="Cookie Consent"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#void" aria-label="Search"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}" aria-label="ControlCenter"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="#" aria-label="TextResizer" data-toggle="modal" data-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="#void" aria-label="TextResizer" data-toggle="modal" data-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_google_translate_icon %}<li id="quickLinksTranslateButton" class="nav-item" style="display: block;"><a href="javascript:j1.translator.showDialog()" aria-label="Google Translate"><i class="{{icon_family}} {{icon_family}}-{{translate_icon}} {{icon_size}}"></i></a></li>{% endif %}
 
   {% comment %} Unused
   --------------------------------------------------------------------------------
-  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#" aria-label="Translator"><i class="{{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#void" aria-label="Translator"><i class="{{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_google_translate_lang %}<li id="quickLinksTranslateLangButton" class="nav-item" style="display: block;"><a href="javascript:j1.translator.showDialog()" aria-label="Google Translate"><i class="flag-icon flag-icon-{{translate_lang}} rectangle size-md"></i></a></li>{% endif %}
   -------------------------------------------------------------------------------- {% endcomment %}
 

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

@@ -1464,7 +1464,7 @@ var j1 = (function () {
           $(window).scrollTop($(window).scrollTop()-1);
         }
       } else if (anchor_id === '#') {
-        logger.info('\n' + 'bound click event to "#", suppress default action');
+        logger.info('\n' + 'bound click event to "#void", suppress default action');
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
         return false;

data/assets/themes/j1/adapter/js/{j1scroll.js → scroller.js}

@@ -6,8 +6,8 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/j1Scroll.js
- # Liquid template to adapt j1Scroll plugin
+ # ~/assets/themes/j1/adapter/js/scroller.js
+ # Liquid template to adapt scroller plugin
  #
  # Product/Info:
  # https://jekyll.one
@@ -40,11 +40,11 @@ regenerate:                             true
 
 {% comment %} Set config data (settings only)
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign scroll_settings   = modules.j1scroll.settings %}
+{% assign scroller_settings = modules.scroller.settings %}
 
 {% comment %} Set config options (settings only)
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign scroll_options    = scroll_settings %}
+{% assign scroller_options  = scroller_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -53,8 +53,8 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/j1Scroll.js
- # J1 Adapter for j1Scroll
+ # ~/assets/themes/j1/adapter/js/scroller.js
+ # J1 Adapter for scroller
  #
  # Product/Info:
  # https://jekyll.one
@@ -77,31 +77,18 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['j1Scroll'] = (function (j1, window) {
-
-  {% comment %} Set global variables
-  ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}';
-  var language      = '{{site.language}}';
-  var user_agent    = platform.ua;
-  var moduleOptions = {};
-  var _this;
-  var lastPageInfo;
-  var logger;
-  var logText;
+j1.adapter['scroller'] = (function (j1, window) {
 
-  // ---------------------------------------------------------------------------
-  // Helper functions
-  // ---------------------------------------------------------------------------
-  function sleep(milliseconds) {
-    var start = new Date().getTime();
-    for (var i = 0; i < 1e7; i++) {
-      if ((new Date().getTime() - start) > milliseconds){
-        break;
-      }
-    }
-    return;
-  }
+{% comment %} Set global variables
+-------------------------------------------------------------------------------- {% endcomment %}
+var environment   = '{{environment}}';
+var language      = '{{site.language}}';
+var user_agent    = platform.ua;
+var moduleOptions = {};
+var _this;
+var logger;
+var logText;
+var lastPageInfo;
 
   // ---------------------------------------------------------------------------
   // Main object
@@ -109,67 +96,60 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
   return {
 
     // -------------------------------------------------------------------------
-    // Initializer
+    // init()
+    // adapter initializer
     // -------------------------------------------------------------------------
     init: function (options) {
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this = j1.adapter.j1Scroll;
-      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
+      _this = j1.adapter.scroller;
+      logger = log4javascript.getLogger('j1.adapter.scroller');
 
       // initialize state flag
       _this.setState('started');
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module is being initialized');
 
-      // -----------------------------------------------------------------------
-      // Default module settings
-      // -----------------------------------------------------------------------
+
+      // default module settings
       var settings = $.extend({
-        module_name: 'j1.adapter.j1Scroll',
+        module_name: 'j1.adapter.scroller',
         generated:   '{{site.time}}'
       }, options);
 
-      {% comment %} Load module config from yml data (disabled)
-      --------------------------------------------------------------------------
-      // Load  module DEFAULTS|CONFIG
-      //
-      /* eslint-disable */
-      moduleOptions = $.extend({}, {{scroll_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      /* eslint-enable */
-
-      if (typeof settings !== 'undefined') {
-        moduleOptions = j1.mergeData(moduleOptions, settings);
-      }
-
-      // _this.initialize(moduleOptions);
-      -------------------------------------------------------------------------- {% endcomment %}
-
-      _this.initialize();
+      _this.generate_scrollers();
 
       _this.setState('finished');
       logger.info('\n' + 'state: ' + _this.getState());
       logger.info('\n' + 'module initialized successfully');
     }, // END init
 
-    // -----------------------------------------------------------------------
-    // Generate scrollers configured/enabled
-    // -----------------------------------------------------------------------
-    initialize: function () {
-      logger = log4javascript.getLogger('j1.adapter.j1Scroll');
+    // -------------------------------------------------------------------------
+    // generate_scrollers()
+    // generate scrollers configured|enabled
+    // -------------------------------------------------------------------------
+    generate_scrollers: function () {
+
+      logger = log4javascript.getLogger('j1.adapter.scroller');
 
-      var log_text = '\n' + 'j1Scroll is being initialized';
-      logger.info(log_text);
+      logText = '\n' + 'scrollers are being initialized';
+      logger.info(logText);
 
       // START generate scrollers
       var dependencies_met_page_ready = setInterval (function (options) {
         if (j1.getState() === 'finished') {
 
-          {% for item in scroll_options.scrollers %} {% if item.scroller.enabled %}
+          {% comment %} generate scrollers of type 'infiniteScroll'
+          ---------------------------------------------------------------------- {% endcomment %}
+
+          {% for item in scroller_options.scrollers %} {% if item.scroller.enabled %}
+
+          {% if item.scroller.type == 'infiniteScroll' %}
 
           {% assign scroller_id     = item.scroller.id %}
+          {% assign scroller_type   = item.scroller.type %}
           {% assign container       = item.scroller.container %}
-          {% assign path            = item.scroller.path  %}
+          {% assign pagePath        = item.scroller.pagePath  %}
           {% assign elementScroll   = item.scroller.elementScroll %}
           {% assign scrollOffset    = item.scroller.scrollOffset %}
           {% assign lastPage        = item.scroller.lastPage %}
@@ -178,20 +158,11 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
           {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
 
           // scroller_id: {{ scroller_id }}
-          var log_text = '\n' + 'j1Scroll is being initialized on: ' + '{{scroller_id}}';
-          logger.info(log_text);
-
-          {% comment %} Unused options
-          ----------------------------------------------------------------------
-          // status:              '.page-scroll-last',
-          // firstPage:            2,
-          // onInit:               function(){},				                        // Callback after plugin has loaded
-          // onBeforeLoad:         function(link){},	                          // Callback before new content is loaded
-          // onAfterLoad:          function(html){}	                            // Callback after new content has been loaded
-          ---------------------------------------------------------------------- {% endcomment %}
+          logText = '\n' + 'scroller of type {{item.scroller.type}} is being initialized on: ' + '{{scroller_id}}';
+          logger.info(logText);
 
           var container = '#' + '{{container}}';
-          var pagePath  = '{{path}}';
+          var pagePath  = '{{pagePath}}';
 
           if (language === 'en') {
             lastPageInfo =  '<div class="page-scroll-last"><p class="infinite-scroll-last">';
@@ -207,42 +178,52 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
             lastPageInfo += '</p></div>';
           }
 
-          // Create an j1Scroll instance if container exists
+          // Create an scroller instance of infiniteScroll if container exists
           if ($(container).length) {
-            $(container).j1Scroll({
-              path:                 pagePath,
-              elementScroll:        {{elementScroll}},
-              scrollOffset:         {{scrollOffset}},
-              lastPage:             {{lastPage}},
-              infoLastPage:         {{infoLastPage}},
-              lastPageInfo:         lastPageInfo,
+            $(container).scroller({
+              id:             '{{scroller_id}}',
+              type:           '{{scroller_type}}',
+              pagePath:       '{{pagePath}}',
+              elementScroll:  {{elementScroll}},
+              scrollOffset:   {{scrollOffset}},
+              lastPage:       {{lastPage}},
+              infoLastPage:   {{infoLastPage}},
+              lastPageInfo:   lastPageInfo,
             });
           }
 
-          {% comment %} Unused callbacks (disabled)
-          ----------------------------------------------------------------------
-          // $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
-          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-          //   var log_text = `\n loaded data from path: ${path}`;
-          //   logger.info(log_text);
-          //
-          //   var log_text = "\n initialize backdrops on load";
-          //   logger.info(log_text);
-          //
-          //   // initialize backdrops
-          //   j1.core.createDropCap();
-          //
-          // });
-          //
-          // $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
-          //   var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
-          //   var log_text = `\n request for the next page to be loaded from path: ${path}`;
-          //   logger.info(log_text);
-          // });
-          ---------------------------------------------------------------------- {% endcomment %}
+          {% endif %}
+
+          {% if item.scroller.type == 'showOnScroll' %}
+
+          {% assign scroller_id     = item.scroller.id %}
+          {% assign scroller_type   = item.scroller.type %}
+          {% assign container       = item.scroller.container %}
+          {% assign showDelay       = item.scroller.showDelay %}
+          {% assign scrollOffset    = item.scroller.scrollOffset  %}
+
+          var container = '#' + '{{container}}';
+
+          // scroller_id: {{ scroller_id }}
+          logText = '\n' + 'scroller of type {{item.scroller.type}} is being initialized on: ' + '{{scroller_id}}';
+          logger.info(logText);
+
+          // Create an scroller instance of showOnScroll if container exists
+          if ($(container).length) {
+            $(container).scroller({
+              id:             '{{scroller_id}}',
+              type:           '{{scroller_type}}',
+              container:      '{{container}}',
+              showDelay:      {{showDelay}},
+              scrollOffset:   {{scrollOffset}},
+            });
+          }
+
+          {% endif %}
 
           // END scroller_id: {{ scroller_id }}
           {% endif %} {% endfor %}
+
           clearInterval(dependencies_met_page_ready);
         }
       });
@@ -250,8 +231,8 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
     },
 
     // -------------------------------------------------------------------------
-    // messageHandler: MessageHandler for j1Scroll module
-    // Manage messages send from other J1 modules
+    // messageHandler()
+    // manage messages send from other J1 modules
     // -------------------------------------------------------------------------
     messageHandler: function (sender, message) {
       var json_message = JSON.stringify(message, undefined, 2);

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

@@ -28,6 +28,7 @@ regenerate:                             true
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
+{% assign contentLanguage     = site.language %}
 {% assign blocks              = site.data.blocks %}
 {% assign modules             = site.data.modules %}
 {% assign template_config     = site.data.j1_config %}
@@ -38,10 +39,9 @@ regenerate:                             true
 {% assign translator_settings = modules.translator.settings %}
 {% assign tracking_enabled    = template_config.analytics.enabled %}
 
-
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign translator_options     = translator_defaults | merge: translator_settings %}
+{% assign translator_options  = translator_defaults | merge: translator_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -396,8 +396,22 @@ j1.adapter['translator'] = (function (j1, window) {
         expires:  365
       });
 
+      // set content language
+      if (moduleOptions.contentLanguage === 'auto') {
+        srcLang = '{{contentLanguage}}';
+      } else {
+        srcLang = moduleOptions.contentLanguage;
+      }
+
+      // translation language MUST be DIFFERENT from content language
+      if (srcLang == selectedTranslationLanguage ) {
+        Cookies.remove('googtrans', { domain: cookie_domain });
+        Cookies.remove('googtrans', { domain: hostname });
+        Cookies.remove('googtrans');
+        location.reload(true);
+      }
+
       // set transCode settings
-      srcLang   = "{{site.language}}";
       destLang  = translation_language;
       transCode = '/' + srcLang + '/' + selectedTranslationLanguage;