j1-template 2021.2.2 → 2021.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f7e03f8152b50d85ea0e9f0b046f35d0365971641373276ef4e7d66ee27a209
-  data.tar.gz: b925f2e885a906d8b7cda24cc49015d017fbf0eedb11d65b6f5361bf04a2f49a
+  metadata.gz: c9dc0e231e62c57b4ba9b58db8fe7fcea64e6e5ce6d4968596be2f0d4b2a327b
+  data.tar.gz: 561ab314b4b3a1c751daa6d44129e28fa2b0df2f8f43593b65ab4281aeacfcbc
 SHA512:
-  metadata.gz: 4f3ce8cdca39ad83576131a23c280f7f44a9d952dbc99802d395d0225dd3ebd59eab0001ff15c473fa69a554cfc31e59a9fd102da3b62c006028037dea3bd519
-  data.tar.gz: d0fd423cb26fb97bb385390a20e834711fb2aeea64b2cf3bfc844006a9edc3960c0901bea53ce18832a36a1925fa788ce86ea45fe646d1a9a5be4da41b7cbfb7
+  metadata.gz: cb8f3b4979535967f5d06502b7534c69f716bd3162688036f2389660054fc274bb21d7005755d71c7f1ffe1d93f7362fe8ad3e103402b35109fee2836782e130
+  data.tar.gz: 9353adba95082496af4415cefe70d5d6ba30bd88c268f00f17ab6d2f6223184ea6019664578cf46f644e5fccb53348e9e5d37e78d3b4a66897e330e5d825f857

data/_layouts/default.html

@@ -212,16 +212,6 @@ layout:                                 compress
 
   </body>
 
-  {% comment %} Place|Initialize module components
-  ------------------------------------------------------------------------------
-  NOTE: xhr_container should be DYNAMICALLY placed by
-        the module using it !!!
-        Example CookieConsent
-  ------------------------------------------------------------------------------ {% endcomment %}
-
-  {% comment %} Place container for Cookiebar modals
-  ------------------------------------------------------------------------------ {% endcomment %}
-
   {% comment %} Place container for WebHook modals
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if webhook_options.enabled %}
@@ -234,11 +224,14 @@ layout:                                 compress
   <!-- [INFO   ] [j1.layout.default.html                ] [ place container for the r-text resizer modal ] -->
   <div id="rtext_resizer_container"></div>
 
-  {% comment %} Initialize Tooltips|Popovers
+  {% comment %} Initialize global JS scripts
   ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize BS tooltips|popovers ] -->
+  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize global JS scripts ] -->
   <script>
     $(function() {
+    {% comment %} BS tooltips and popovers
+    ---------------------------------------------------------------------------- {% endcomment %}
+    // initialize BS tooltips and popovers
     {% if tooltips_options.enabled %}
       $('[data-toggle="tooltip"').tooltip({
         trigger: '{{tooltips_options.trigger}}'
@@ -249,25 +242,39 @@ layout:                                 compress
         trigger: '{{popovers_options.trigger}}'
       });
     {% endif %}
-    });
-  </script>
 
-  {% comment %} Initialize Window History (back on <ESC>)
-  ------------------------------------------------------------------------------ {% endcomment %}
-  <!-- [INFO   ] [j1.layout.default.html                ] [ initialize window.history.back ] -->
-  <script>
-  // Redirect on KEY <ESC>
-  window.onkeyup = function (e)
-  {
-   if (e.keyCode == 27) window.history.back();
-  }
+    {% comment %} Update cookie for lastpage
+    ---------------------------------------------------------------------------- {% endcomment %}
+      // save the current page to userstate cookie
+      var dependencies_met_page_ready = setInterval (function (options) {
+        if (j1.getState() === 'finished') {
+          var logger = log4javascript.getLogger('j1.layout.default');
+
+          function setLastPage() {
+            var cookie_names                = j1.getCookieNames();
+            const user_state_cookie_name    = cookie_names.user_session;
+            var user_state                  = j1.readCookie(user_state_cookie_name);
+            var user_state_last_page        = window.location.pathname;
+            user_state.last_page            = user_state_last_page;
+
+            j1.writeCookie({
+              name: user_state_cookie_name,
+              data: user_state,
+              samesite: 'Strict'
+            });
+            logger.debug('\n' + 'saved current page to cookie :' + user_state_last_page);
+          }
+          setLastPage();
+          clearInterval(dependencies_met_page_ready);
+        }
+      });
+    });
   </script>
   <!-- [INFO   ] [j1.layout.default.html                ] [ end page processing ] -->
 </html>
 
 {% endcapture %}
 
-
 {% comment %} POST processing of the generated page using (captured) cache
 -------------------------------------------------------------------------------- {% endcomment %}
 {% case environment %}
@@ -281,7 +288,6 @@ layout:                                 compress
       {{ j1_cache | strip_empty_lines | remove: '<p>excerpt__end</p>' }}
     {% endif %} {% comment %} END prettify {% endcomment %}
 
-
   {% comment %} PRODUCTION mode
   ------------------------------------------------------------------------------ {% endcomment %}
   {% when 'production' or 'prod' %}

data/assets/data/quicklinks.html

@@ -144,7 +144,6 @@ exclude_from_search:                    true
   authentication_enabled: {{ authentication_enabled | debug }}
 -->
 
-
 {% comment %} Show|Hide Control Center icon
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if cc_app_config_options.enabled %}
@@ -236,7 +235,7 @@ exclude_from_search:                    true
   {% 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_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_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_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#" aria-label="Search"><i class="{{icon_family}} {{icon_family}}-{{search_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 %}
 </ul>

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

@@ -55,7 +55,6 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/fam.js
@@ -232,6 +231,7 @@ j1.adapter['fam'] = (function (j1, window) {
       $('a[href="#void"]').click(function(e) {
         e.preventDefault ? e.preventDefault() : e.returnValue = false;
         logger.info('\n' + 'bound click event to "#void", suppress default action');
+        return false;
       });
 
       // check if multiple buttons detected