j1-template 2021.2.9 → 2021.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64e1d499ca9e8ece6d9a0cbe0801a435bca3c67cb88933a4d0612df00012015
-  data.tar.gz: 50a27e100d831f61f1f4a0f5a9cf83b063faf91a229f58082c028f93da7ff400
+  metadata.gz: 91ee0616f0905e55586302ee465112ca879423feebacb51e93e04f92f4978189
+  data.tar.gz: c64b4a5cfab5cef176f43568c76c5ec0c2550fb7cc8a37df5e8ac97f5cbb957f
 SHA512:
-  metadata.gz: fb2a39afa3c93c9c9a90bdf0842bd5682e707c6a4826a883e2891667ebee55fc4db3b58f5de1119f29925dd91c2458074a12641e1e61e1a161e39ac881dcb794
-  data.tar.gz: 074bc700d955b9920639dfcbe8af2fe5612ab37e2769e5412039021b72a133661cccfd183bf3b9b20bd1e5fa724ac7e2a92a484d10df68f0b7fbb910991a689b
+  metadata.gz: 40b74cefa0cf230f69156a18b42e6df4932187c6b3b05083efdf11f6d84126e0bcc1279c375692a3360f539b183ab7de2b32a89eb584aadf8e039813bde69aba
+  data.tar.gz: 14207a1cd40024aaae0fe3c83a1aa0a72b36e2ba348315e3e2c06b0a8625b38be8405bbce5719c85bb1f00d8f6819e604803575f76a4dbbadb5c5010eca8b09a

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

@@ -174,7 +174,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
           logger.info('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          j1.cookieConsent = new BootstrapCookieConsent({
+          j1.cookieConsent = new CookieConsent ({
             contentURL:             moduleOptions.contentURL,                   // dialog content (modals) for all supported languages
             cookieName:             moduleOptions.cookieName,                   // name of the consent cookie
             cookieSameSite:         moduleOptions.cookieSameSite,               // restrict consent cookie
@@ -183,7 +183,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
             reloadPageOnChange:     moduleOptions.reloadPageOnChange,           // reload if setzings has changed
             dialogContainerID:      moduleOptions.dialogContainerID,            // container, the dialog modal is (dynamically) loaded
             xhrDataElement:         moduleOptions.xhrDataElement,               // container for all language-specific dialogs (modals)
-            postSelectionCallback:  function () {j1.adapter.cookieConsent.cbCookie()}
+            postSelectionCallback:  moduleOptions.postSelectionCallback,        // callback function, called after the user has made his selection        
           });
 
           _this.setState('finished');
@@ -303,7 +303,8 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
             name:     cookie_names.user_translate,
             data:     user_translate,
             samesite: 'Strict',
-            secure:   secure
+            secure:   secure,
+            expires:  365
           });
 
         }

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

@@ -87,7 +87,6 @@ j1.adapter['translator'] = (function (j1, window) {
   var user_translate    = {};
   var _this;
   var $modal;
-  var domain;
   var cookie_names;
   var user_consent;
   var logger;
@@ -95,7 +94,7 @@ j1.adapter['translator'] = (function (j1, window) {
   var baseUrl;
   var hostname;
   var domain;
-  var cookie_sub_domains;
+  var cookie_domain;
   var secure;
   var logText;
   var cookie_written;
@@ -170,6 +169,7 @@ j1.adapter['translator'] = (function (j1, window) {
       baseUrl               = url.origin;
       hostname              = url.hostname;
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
+      cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
       secure                = (url.protocol.includes('https')) ? true : false;
       modal_language        = "{{site.language}}";
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
@@ -190,13 +190,6 @@ j1.adapter['translator'] = (function (j1, window) {
         'translationLanguage':      translation_language,
       };
 
-      // set sub domain settings for cookies
-      if(domain !== 'localhost') {
-        cookie_sub_domains = '.' + hostname;
-      } else {
-        cookie_sub_domains = hostname;
-      }
-
       // load|initialize user translate cookie
       if (j1.existsCookie(cookie_names.user_translate)) {
         user_translate = j1.readCookie(cookie_names.user_translate);
@@ -206,6 +199,7 @@ j1.adapter['translator'] = (function (j1, window) {
           name:     cookie_names.user_translate,
           data:     user_translate,
           samesite: 'Strict',
+          secure:   secure,
           expires:  365
         });
       }
@@ -272,7 +266,8 @@ j1.adapter['translator'] = (function (j1, window) {
             name:     cookie_names.user_translate,
             data:     user_translate,
             samesite: 'Strict',
-            secure:   secure
+            secure:   secure,
+            expires:  365
           });
 
           j1.translator = new Translator({
@@ -300,7 +295,10 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           } else {
             if (moduleOptions.translatorName === 'google') {
-              j1.removeCookie({name: 'googtrans', domain: domain});
+              // remove all googtrans cookies that POTENTIALLY exists
+              Cookies.remove('googtrans', { domain: cookie_domain });
+              Cookies.remove('googtrans', { domain: hostname });
+              Cookies.remove('googtrans');
             }
           }
 
@@ -395,7 +393,7 @@ j1.adapter['translator'] = (function (j1, window) {
         data:     user_consent,
         samesite: 'Strict',
         secure:   secure,
-        expires:  0
+        expires:  365
       });
 
       // set transCode settings
@@ -403,11 +401,13 @@ j1.adapter['translator'] = (function (j1, window) {
       destLang  = translation_language;
       transCode = '/' + srcLang + '/' + selectedTranslationLanguage;
 
-      // write the googtrans cookie
-      setCookie({
-        name: 'googtrans',
-        data: transCode
-      });
+      // remove all googtrans cookies that POTENTIALLY exists
+      Cookies.remove('googtrans', { domain: cookie_domain });
+      Cookies.remove('googtrans', { domain: hostname });
+      Cookies.remove('googtrans');
+
+      // write the googtrans cookie w/o DOMAIN!
+      Cookies.set('googtrans', transCode);
 
       // reload current page (skip cache)
       location.reload(true);

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/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.2.9'
+  VERSION = '2021.2.10'
 end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2021.2.9'
+gem 'j1-template', '~> 2021.2.10'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.2.9
+version:                                2021.2.10
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/cookieconsent.yml

@@ -27,7 +27,6 @@ settings:
 
   enabled:                            true
   show_cookie_icon:                   true
-  reloadPageOnChange:                 true
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -25,6 +25,8 @@ about_config:
 defaults:
 
   enabled:                              false
+
+  reloadPageOnChange:                   true
   autoShowDialog:                       true                                    # show consent dialog if NO consent cookie found
   dialogLanguage:                       content                                 # auto|content|one of dialogLanguages
   dialogLanguages:                      [en, de]                                # supported dialog (modal) languages, defaults to FIRST language defined by languages
@@ -36,7 +38,7 @@ defaults:
   whitelisted:                          [ '/pages/public/legal/en/privacy' ]    # pages NO consent issued, currently NOT supported
   xhrDataElement:                       consent-data                            # container for all language-specific consent modals (taken from contentURL)
   dialogContainerID:                    consent-dialog                          # container, the dialog modal is (dynamically) loaded
-  postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # currently hardcoded
+  postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # called after the user has made his selection
 
   modal_settings:
 

data/lib/starter_web/_data/modules/defaults/translator.yml

@@ -46,7 +46,7 @@ defaults:
 #
   google:
 
-    postSelectionCallback:              "j1.adapter.translator.cbGoogle"        # callback to run the translation
+    postSelectionCallback:              j1.adapter.translator.cbGoogle          # callback to run the translation
     hideSuggestionBox:                  true                                    # disable suggestions on translated text
     hidePoweredBy:                      true                                    # disable label "Powered by Google"
     hideTopFrame:                       true                                    # disable the (google) translator frame

data/lib/starter_web/_includes/attributes.asciidoc

@@ -433,7 +433,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.2.9
+:j1--version:                                     2021.2.10
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.2.9'
+    VERSION = '2021.2.10'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.2.9",
+  "version": "2021.2.10",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.2.9",
+  "version": "2021.2.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2021.2.9",
+  "version": "2021.2.10",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2021.2.9
+  version: 2021.2.10
 platform: ruby
 authors:
 - juergen_jekyll_one