j1-template 2021.2.9 → 2021.3.0

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

@@ -37,7 +37,7 @@
 /* eslint JSUnfilteredForInLoop: "off"                                        */
 // -----------------------------------------------------------------------------
 
-function BootstrapCookieConsent(props) {
+function CookieConsent(props) {
   var logger                = log4javascript.getLogger('j1.core.bsCookieConsent');
   var self                  = this;
   var detailedSettingsShown = false;
@@ -58,11 +58,12 @@ function BootstrapCookieConsent(props) {
     contentURL:             '/assets/data/cookieconsent',                       // URL contain the consent dialogs (modals) for ALL supported languages
     cookieName:             'j1.user.translate',                                // name of the cookie, in which the configuration is stored
     cookieStorageDays:      365,                                                // duration the configuration cookie is stored on the client
-    postSelectionCallback:  undefined,                                          // callback function, called after the user has made his selection
+    postSelectionCallback:  '',                                                 // callback function, called after the user has made his selection
     whitelisted:            [],                                                 // pages NO consent modal dialog is issued
     xhrDataElement:         'consent-data',                                     // src container for all language-specific consent dialogs (taken from contentURL)
     dialogContainerID:      'consent-modal',                                    // dest container, the dialog modal is loaded (dynamically)
     cookieSameSite:         'Strict',                                           // restrict the consent cookie to first-party (do NOT send cookie to other domains)
+    cookieSecure:           true
   };
 
   // merge property settings
@@ -128,6 +129,59 @@ function BootstrapCookieConsent(props) {
     }
   };
 
+  // ---------------------------------------------------------------------------
+  // extend()
+  // deep merge of two objects
+  // ---------------------------------------------------------------------------
+  function extend () {
+    var extended = {};
+    var deep = false;
+    var i = 0;
+    var length = arguments.length;
+
+    // Check if a deep merge
+    if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) {
+        deep = arguments[0];
+        i++;
+    }
+
+    // Merge the object into the extended object
+    var merge = function (obj) {
+        for ( var prop in obj ) {
+            if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) {
+                // If deep merge and property is an object, merge properties
+                if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) {
+                    extended[prop] = extend( true, extended[prop], obj[prop] );
+                } else {
+                    extended[prop] = obj[prop];
+                }
+            }
+        }
+    };
+
+    // Loop through each object and conduct a merge
+    for ( ; i < length; i++ ) {
+        var obj = arguments[i];
+        merge(obj);
+     }
+           return extended;
+  }
+
+  // ---------------------------------------------------------------------------
+  // executeFunctionByName()
+  // execute a function by NAME (functionName) in a browser context
+  // (e.g. window) the function is published
+  // ---------------------------------------------------------------------------
+  function executeFunctionByName (functionName, context /*, args */) {
+    var args = Array.prototype.slice.call(arguments, 2);
+    var namespaces = functionName.split('.');
+    var func = namespaces.pop();
+    for(var i = 0; i < namespaces.length; i++) {
+      context = context[namespaces[i]];
+    }
+    return context[func].apply(context, args);
+  }
+
   function showDialog(options) {
     Events.documentReady(function () {
 
@@ -143,11 +197,17 @@ function BootstrapCookieConsent(props) {
         document.body.append(self.modal);
         self.$modal = $(self.modal);
 
-        if (self.props.postSelectionCallback) {
-          self.$modal.on("hidden.bs.modal", function () {
-            self.props.postSelectionCallback();
-          });
-        }
+        // ---------------------------------------------------------------------
+        // register events for the dialog (modal)
+        // ---------------------------------------------------------------------
+
+        // ---------------------------------------------------------------------
+        // on 'hidden'
+        // ---------------------------------------------------------------------
+        self.$modal.on('hidden.bs.modal', function () {
+          // process settings after the user has made his selections
+          executeFunctionByName (self.props.postSelectionCallback, window);
+        }); // END modal on 'hidden'
 
         // load modal content
         //
@@ -253,12 +313,12 @@ function BootstrapCookieConsent(props) {
   }
 
   function agreeAll() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(true)), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
     self.$modal.modal('hide');
   }
 
   function doNotAgree() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions(false)), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    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
@@ -271,7 +331,7 @@ function BootstrapCookieConsent(props) {
   }
 
   function saveSettings() {
-    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.cookieSameSite, self.props.cookieSecure);
+    Cookie.set(self.props.cookieName, JSON.stringify(gatherOptions()), self.props.cookieStorageDays, self.props.cookieSameSite, cookieSecure);
     self.$modal.modal('hide');
   }
 

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

@@ -24,4 +24,4 @@
  #  outside of J1 Template!
  # -----------------------------------------------------------------------------
 */
-function BootstrapCookieConsent(c){var t=log4javascript.getLogger("j1.core.bsCookieConsent");var r="bccs-modal";var o=this;var p=false;var d=new liteURL(window.location.href);var m=(d.protocol.includes("https"))?true:false;var h;var f;var s;t.info("\ninitializing core module: started");t.info("\nstate: started");this.props={autoShowDialog:true,language:navigator.language,languages:["en","de"],contentURL:"./content",cookieName:"cookie-consent-settings",cookieStorageDays:365,postSelectionCallback:undefined,whitelisted:[],xhr_data_element:"",sameSite:"Strict",secure:false};for(var e in c){this.props[e]=c[e]}this.language=this.props.language;if(this.language.indexOf("-")!==-1){this.language=this.language.split("-")[0]}if(!this.props.languages.includes(this.language)){this.language=this.props.languages[0]}var g={set:function(w,y,B,x,z){var A=window.btoa(y);var u="";if(B){var v=new Date();v.setTime(v.getTime()+(B*24*60*60*1000));u="; expires="+v.toUTCString()}if(z){document.cookie=w+"="+(A||"")+u+"; Path=/; SameSite="+x+"; secure="+z+";"}else{document.cookie=w+"="+(A||"")+u+"; Path=/; SameSite="+x+";"}},get:function(v){var y=v+"=";var u=document.cookie.split(";");for(var w=0;w<u.length;w++){var A=u[w];while(A.charAt(0)===" "){A=A.substring(1,A.length)}if(A.indexOf(y)===0){var z=A.substring(y.length,A.length);var x=window.atob(z);return x}}return undefined}};var l={documentReady:function(u){if(document.readyState!=="loading"){u()}else{document.addEventListener("DOMContentLoaded",u)}}};function k(u){l.documentReady(function(){o.modal=document.getElementById(r);if(!o.modal){t.info("\nload consent modal");o.modal=document.createElement("div");o.modal.id=r;o.modal.setAttribute("class","modal fade");o.modal.setAttribute("tabindex","-1");o.modal.setAttribute("role","dialog");o.modal.setAttribute("aria-labelledby",r);document.body.append(o.modal);o.$modal=$(o.modal);if(o.props.postSelectionCallback){o.$modal.on("hidden.bs.modal",function(){o.props.postSelectionCallback()})}var v=o.props.contentURL+"/index.html";$.get(v).done(function(w){t.info("\nloading consent modal: successfully");o.modal.innerHTML=w;o.modal.innerHTML=$("#"+o.props.xhr_data_element).eq(0).html();$(o.modal).modal({backdrop:"static",keyboard:false});o.$buttonDoNotAgree=$("#bccs-buttonDoNotAgree");o.$buttonAgree=$("#bccs-buttonAgree");o.$buttonSave=$("#bccs-buttonSave");o.$buttonAgreeAll=$("#bccs-buttonAgreeAll");t.info("\nload/initialze options from cookie");j();i();$("#bccs-options").on("hide.bs.collapse",function(){p=false;j()}).on("show.bs.collapse",function(){p=true;j()});t.info("\ninitialze event handler");o.$buttonDoNotAgree.click(function(){b()});o.$buttonAgree.click(function(){n()});o.$buttonSave.click(function(){$("#bccs-options").collapse("hide");q();i()});o.$buttonAgreeAll.click(function(){$("#bccs-options").collapse("hide");n();i()})}).fail(function(){t.error("\nloading consent modal: failed");t.warn("\nprobably no `contentURL` set")})}else{o.$modal.modal("show")}}.bind(this))}function i(){var w=o.getSettings();if(w){for(var v in w){var u=o.$modal.find("#bccs-options .bccs-option[data-name='"+v+"'] input[type='checkbox']");u.prop("checked",w[v])}}}function j(){if(p){o.$buttonDoNotAgree.hide();o.$buttonAgree.hide();o.$buttonSave.show();o.$buttonAgreeAll.show()}else{o.$buttonDoNotAgree.show();o.$buttonAgree.show();o.$buttonSave.hide();o.$buttonAgreeAll.hide()}}function a(v){var u=o.$modal.find("#bccs-options .bccs-option");var x={};for(var y=0;y<u.length;y++){var A=u[y];var w=A.getAttribute("data-name");if(w==="necessary"){x[w]=true}else{if(v===undefined){var z=$(A).find("input[type='checkbox']");x[w]=z.prop("checked")}else{x[w]=!!v}}}return x}function n(){g.set(o.props.cookieName,JSON.stringify(a(true)),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide")}function b(){g.set(o.props.cookieName,JSON.stringify(a(false)),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide");j1.goHome()}function q(){g.set(o.props.cookieName,JSON.stringify(a()),o.props.cookieStorageDays,o.props.sameSite,o.props.secure);o.$modal.modal("hide")}s=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(g.get(this.props.cookieName)===undefined&&this.props.autoShowDialog&&!s){k()}t.info("\ninitializing core module finished");t.info("\nstate: finished");this.showDialog=function(){s=(this.props.whitelisted.indexOf(window.location.pathname)>-1);if(!s){k()}};this.getSettings=function(v){var u=g.get(o.props.cookieName);if(u){var w=JSON.parse(g.get(o.props.cookieName));if(v===undefined){return w}else{if(w){return w[v]}else{return false}}}else{return undefined}}};
+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}}

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) == "#" )
+					else if ( sAttr.charAt(0) == "#void" )
 					{
 						nNewNode.id = sAttr.substr(1, sAttr.length-1);
 					}