j1-template 2021.3.1 → 2022.0.2

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js

@@ -24,7 +24,6 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-//'use strict';
 
 // -----------------------------------------------------------------------------
 // ESLint shimming
@@ -37,6 +36,7 @@
 /* eslint JSUnfilteredForInLoop: "off"                                        */
 // -----------------------------------------------------------------------------
 
+'use strict';
 function CookieConsent(props) {
   var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
   var self                  = this;
@@ -89,8 +89,8 @@ function CookieConsent(props) {
   var Cookie = {
     set: function (name, value, days, cookieSameSite, cookieSecure) {
       var value_encoded = window.btoa(value);
-      var expires = "";
-      if (days) {
+      var expires = '; expires=Thu, 01 Jan 1970 00:00:00 UTC';
+      if (days>0) {
         var date = new Date();
         date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
         expires = "; expires=" + date.toUTCString();
@@ -188,8 +188,11 @@ function CookieConsent(props) {
       self.modal = document.getElementById(self.props.dialogContainerID);
       if (!self.modal) {
         logger.info('\n' +  'load consent modal');
+
         self.modal = document.createElement("div");
         self.modal.id = self.props.dialogContainerID;
+        self.modal.style.display = 'none';
+
         self.modal.setAttribute("class", "modal fade");
         self.modal.setAttribute("tabindex", "-1");
         self.modal.setAttribute("role", "dialog");
@@ -215,8 +218,9 @@ function CookieConsent(props) {
         $.get(templateUrl)
         .done(function (data) {
           logger.info('\n' + 'loading consent modal: successfully');
-          self.modal.innerHTML = data;
-          self.modal.innerHTML = $('#' + self.props.xhrDataElement).eq(0).html();
+          self.modal.innerHTML      = data;
+          self.modal.innerHTML      = $('#' + self.props.xhrDataElement).eq(0).html();
+          self.modal.style.display  = 'block';
 
           $(self.modal).modal({
             backdrop: "static",
@@ -259,6 +263,8 @@ function CookieConsent(props) {
             agreeAll();
             updateOptionsFromCookie();
           });
+
+          self.$modal.modal('show');
         })
         .fail(function () {
           logger.error('\n' + 'loading consent modal: failed');
@@ -318,16 +324,11 @@ function CookieConsent(props) {
   }
 
   function doNotAgree() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
-
-    // jadams, 2021-07-15: all cookies NOT longer supported by j1.expireCookie
-    // TODO: Create loop over all cookies found in page
-    //
-    // logger.warn('expire all cookies');
-    // j1.expireCookie('all');
-
+    // Remove consent cookie
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), 0, self.props.cookieSameSite, cookieSecure);
     self.$modal.modal('hide');
-    j1.goHome();
+    // redirect to error page: blocked site
+    window.location.href = '/445.html';
   }
 
   function saveSettings() {
@@ -335,10 +336,11 @@ function CookieConsent(props) {
     self.$modal.modal('hide');
   }
 
-  // call consent dialog if no cookie found (except pages whitelisted)
+  // call consent dialog if no cookie found or cookie NOT accepted (except whitelisted pages)
   //
-  whitelisted  = (this.props.whitelisted.indexOf(window.location.pathname) > -1);
-  if (Cookie.get(this.props.cookieName) === undefined && this.props.autoShowDialog && !whitelisted) {
+  whitelisted = (this.props.whitelisted.indexOf(window.location.pathname) > -1);
+  var consentCookie = Cookie.get(this.props.cookieName);
+  if ((consentCookie === undefined || consentCookie === "false") && this.props.autoShowDialog && !whitelisted) {
     showDialog();
   }
 

data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js

@@ -24,4 +24,4 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-function CookieConsent(o){function e(o,e){for(var t=Array.prototype.slice.call(arguments,2),n=o.split("."),i=n.pop(),a=0;a<n.length;a++)e=e[n[a]];return e[i].apply(e,t)}function t(o){b.documentReady(function(){if(p.modal=document.getElementById(p.props.dialogContainerID),p.modal)p.$modal.modal("show");else{d.info("\nload consent modal"),p.modal=document.createElement("div"),p.modal.id=p.props.dialogContainerID,p.modal.setAttribute("class","modal fade"),p.modal.setAttribute("tabindex","-1"),p.modal.setAttribute("role","dialog"),p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID),document.body.append(p.modal),p.$modal=$(p.modal),p.$modal.on("hidden.bs.modal",function(){e(p.props.postSelectionCallback,window)});var o=p.props.contentURL+"/index.html";$.get(o).done(function(o){d.info("\nloading consent modal: successfully"),p.modal.innerHTML=o,p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html(),$(p.modal).modal({backdrop:"static",keyboard:!1}),p.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree"),p.$buttonAgree=$("#bccs-buttonAgree"),p.$buttonSave=$("#bccs-buttonSave"),p.$buttonAgreeAll=$("#bccs-buttonAgreeAll"),d.info("\nload/initialze options from cookie"),i(),n(),$("#bccs-options").on("hide.bs.collapse",function(){g=!1,i()}).on("show.bs.collapse",function(){g=!0,i()}),d.info("\ninitialze event handler"),p.$buttonDoNotAgree.click(function(){r()}),p.$buttonAgree.click(function(){s()}),p.$buttonSave.click(function(){$("#bccs-options").collapse("hide"),c(),n()}),p.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide"),s(),n()})}).fail(function(){d.error("\nloading consent modal: failed"),d.warn("\nprobably no `contentURL` set")})}}.bind(this))}function n(){var o=p.getSettings();if(o)for(var e in o){var t=p.$modal.find("#bccs-options .bccs-option[data-name='"+e+"'] input[type='checkbox']");t.prop("checked",o[e])}}function i(){g?(p.$buttonDoNotAgree.hide(),p.$buttonAgree.hide(),p.$buttonSave.show(),p.$buttonAgreeAll.show()):(p.$buttonDoNotAgree.show(),p.$buttonAgree.show(),p.$buttonSave.hide(),p.$buttonAgreeAll.hide())}function a(o){for(var e=p.$modal.find("#bccs-options .bccs-option"),t={},n=0;n<e.length;n++){var i=e[n],a=i.getAttribute("data-name");if("necessary"===a)t[a]=!0;else if(void 0===o){var s=$(i).find("input[type='checkbox']");t[a]=s.prop("checked")}else t[a]=!!o}return t}function s(){f.set(p.props.cookieName,JSON.stringify(a(!0)),p.props.cookieStorageDays,p.props.cookieSameSite,m),p.$modal.modal("hide")}function r(){f.set(p.props.cookieName,JSON.stringify(a(!1)),p.props.cookieStorageDays,p.props.cookieSameSite,m),p.$modal.modal("hide"),j1.goHome()}function c(){f.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.cookieSameSite,m),p.$modal.modal("hide")}var l,d=log4javascript.getLogger("j1.core.bsCookieConsent"),p=this,g=!1,u=new liteURL(window.location.href),m=u.protocol.includes("https")?!0:!1;d.info("\ninitializing core module: started"),d.info("\nstate: started"),this.props={autoShowDialog:!0,dialogLanguage:"content",dialogLanguages:["en","de"],contentURL:"/assets/data/cookieconsent",cookieName:"j1.user.translate",cookieStorageDays:365,postSelectionCallback:"",whitelisted:[],xhrDataElement:"consent-data",dialogContainerID:"consent-modal",cookieSameSite:"Strict",cookieSecure:!0};for(var h in o)this.props[h]=o[h];-1!==this.props.dialogLanguage.indexOf("-")&&(this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]),this.props.dialogLanguages.includes(this.props.dialogLanguage)||(this.props.dialogLanguage=this.props.dialogLanguages[0]),this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage,this.props.cookieSecure=m;var f={set:function(o,e,t,n,i){var a=window.btoa(e),s="";if(t){var r=new Date;r.setTime(r.getTime()+24*t*60*60*1e3),s="; expires="+r.toUTCString()}i?document.cookie=o+"="+(a||"")+s+"; Path=/; cookieSameSite="+n+"; cookieSecure="+i+";":document.cookie=o+"="+(a||"")+s+"; Path=/; cookieSameSite="+n+";"},get:function(o){for(var e=o+"=",t=document.cookie.split(";"),n=0;n<t.length;n++){for(var i=t[n];" "===i.charAt(0);)i=i.substring(1,i.length);if(0===i.indexOf(e)){var a=i.substring(e.length,i.length),s=window.atob(a);return s}}return void 0}},b={documentReady:function(o){"loading"!==document.readyState?o():document.addEventListener("DOMContentLoaded",o)}};l=this.props.whitelisted.indexOf(window.location.pathname)>-1,void 0===f.get(this.props.cookieName)&&this.props.autoShowDialog&&!l&&t(),d.info("\ninitializing core module finished"),d.info("\nstate: finished"),this.showDialog=function(){l=this.props.whitelisted.indexOf(window.location.pathname)>-1,l||t()},this.getSettings=function(o){var e=f.get(p.props.cookieName);if(e){var t=JSON.parse(f.get(p.props.cookieName));return void 0===o?t:t?t[o]:!1}return void 0}}
+"use strict";function CookieConsent(d){var v=log4javascript.getLogger("j1.core.bsCookieConsent");var p=this;var q=false;var e=new liteURL(window.location.href);var c=(e.protocol.includes("https"))?true:false;var j;var g;var t;v.info("\ninitializing core module: started");v.info("\nstate: started");this.props={autoShowDialog:true,dialogLanguage:"content",dialogLanguages:["en","de"],contentURL:"/assets/data/cookieconsent",cookieName:"j1.user.translate",cookieStorageDays:365,postSelectionCallback:"",whitelisted:[],xhrDataElement:"consent-data",dialogContainerID:"consent-modal",cookieSameSite:"Strict",cookieSecure:true};for(var f in d){this.props[f]=d[f]}if(this.props.dialogLanguage.indexOf("-")!==-1){this.props.dialogLanguage=this.props.dialogLanguage.split("-")[0]}if(!this.props.dialogLanguages.includes(this.props.dialogLanguage)){this.props.dialogLanguage=this.props.dialogLanguages[0]}this.props.xhrDataElement=this.props.xhrDataElement+"-"+this.props.dialogLanguage;this.props.cookieSecure=c;var h={set:function(z,B,D,A,x){var C=window.btoa(B);var w="; expires=Thu, 01 Jan 1970 00:00:00 UTC";if(D>0){var y=new Date();y.setTime(y.getTime()+(D*24*60*60*1000));w="; expires="+y.toUTCString()}if(x){document.cookie=z+"="+(C||"")+w+"; Path=/; cookieSameSite="+A+"; cookieSecure="+x+";"}else{document.cookie=z+"="+(C||"")+w+"; Path=/; cookieSameSite="+A+";"}},get:function(x){var A=x+"=";var w=document.cookie.split(";");for(var y=0;y<w.length;y++){var C=w[y];while(C.charAt(0)===" "){C=C.substring(1,C.length)}if(C.indexOf(A)===0){var B=C.substring(A.length,C.length);var z=window.atob(B);return z}}return undefined}};var n={documentReady:function(w){if(document.readyState!=="loading"){w()}else{document.addEventListener("DOMContentLoaded",w)}}};function u(){var w={};var x=false;var y=0;var z=arguments.length;if(Object.prototype.toString.call(arguments[0])==="[object Boolean]"){x=arguments[0];y++}var B=function(C){for(var D in C){if(Object.prototype.hasOwnProperty.call(C,D)){if(x&&Object.prototype.toString.call(C[D])==="[object Object]"){w[D]=u(true,w[D],C[D])}else{w[D]=C[D]}}}};for(;y<z;y++){var A=arguments[y];B(A)}return w}function i(B,y){var w=Array.prototype.slice.call(arguments,2);var A=B.split(".");var z=A.pop();for(var x=0;x<A.length;x++){y=y[A[x]]}return y[z].apply(y,w)}function m(w){n.documentReady(function(){p.modal=document.getElementById(p.props.dialogContainerID);if(!p.modal){v.info("\nload consent modal");p.modal=document.createElement("div");p.modal.id=p.props.dialogContainerID;p.modal.style.display="none";p.modal.setAttribute("class","modal fade");p.modal.setAttribute("tabindex","-1");p.modal.setAttribute("role","dialog");p.modal.setAttribute("aria-labelledby",p.props.dialogContainerID);document.body.append(p.modal);p.$modal=$(p.modal);p.$modal.on("hidden.bs.modal",function(){i(p.props.postSelectionCallback,window)});var x=p.props.contentURL+"/index.html";$.get(x).done(function(y){v.info("\nloading consent modal: successfully");p.modal.innerHTML=y;p.modal.innerHTML=$("#"+p.props.xhrDataElement).eq(0).html();p.modal.style.display="block";$(p.modal).modal({backdrop:"static",keyboard:false});p.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");p.$buttonAgree=$("#bccs-buttonAgree");p.$buttonSave=$("#bccs-buttonSave");p.$buttonAgreeAll=$("#bccs-buttonAgreeAll");v.info("\nload/initialze options from cookie");l();k();$("#bccs-options").on("hide.bs.collapse",function(){q=false;l()}).on("show.bs.collapse",function(){q=true;l()});v.info("\ninitialze event handler");p.$buttonDoNotAgree.click(function(){b()});p.$buttonAgree.click(function(){o()});p.$buttonSave.click(function(){$("#bccs-options").collapse("hide");s();k()});p.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");o();k()});p.$modal.modal("show")}).fail(function(){v.error("\nloading consent modal: failed");v.warn("\nprobably no `contentURL` set")})}else{p.$modal.modal("show")}}.bind(this))}function k(){var y=p.getSettings();if(y){for(var x in y){var w=p.$modal.find("#bccs-options .bccs-option[data-name='"+x+"'] input[type='checkbox']");w.prop("checked",y[x])}}}function l(){if(q){p.$buttonDoNotAgree.hide();p.$buttonAgree.hide();p.$buttonSave.show();p.$buttonAgreeAll.show()}else{p.$buttonDoNotAgree.show();p.$buttonAgree.show();p.$buttonSave.hide();p.$buttonAgreeAll.hide()}}function a(x){var w=p.$modal.find("#bccs-options .bccs-option");var z={};for(var A=0;A<w.length;A++){var C=w[A];var y=C.getAttribute("data-name");if(y==="necessary"){z[y]=true}else{if(x===undefined){var B=$(C).find("input[type='checkbox']");z[y]=B.prop("checked")}else{z[y]=!!x}}}return z}function o(){h.set(p.props.cookieName,JSON.stringify(a(true)),p.props.cookieStorageDays,p.props.cookieSameSite,c);p.$modal.modal("hide")}function b(){h.set(p.props.cookieName,JSON.stringify(a(false)),0,p.props.cookieSameSite,c);p.$modal.modal("hide");window.location.href="/445.html"}function s(){h.set(p.props.cookieName,JSON.stringify(a()),p.props.cookieStorageDays,p.props.cookieSameSite,c);p.$modal.modal("hide")}t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);var r=h.get(this.props.cookieName);if((r===undefined||r==="false")&&this.props.autoShowDialog&&!t){m()}v.info("\ninitializing core module finished");v.info("\nstate: finished");this.showDialog=function(){t=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!t){m()}};this.getSettings=function(x){var w=h.get(p.props.cookieName);if(w){var y=JSON.parse(h.get(p.props.cookieName));if(x===undefined){return y}else{if(y){return y[x]}else{return false}}}else{return undefined}}};

data/assets/themes/j1/modules/datatables/js/datatables.js

@@ -70229,7 +70229,7 @@ this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = {
 						nNewNode.id = aSplit[0].substr(1, aSplit[0].length-1);
 						nNewNode.className = aSplit[1];
 					}
-					else if ( sAttr.charAt(0) == "#void" )
+					else if ( sAttr.charAt(0) == "#" )
 					{
 						nNewNode.id = sAttr.substr(1, sAttr.length-1);
 					}