j1-template 2020.0.13 → 2020.0.14

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

@@ -46,7 +46,6 @@ regenerate: true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -101,8 +100,15 @@ j1.adapter['algolia'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.algolia;
+      logger  = log4javascript.getLogger('j1.adapter.algolia');
+
       // initialize state flag
-      j1.adapter.algolia.state = 'pending';
+      _this.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -112,11 +118,6 @@ j1.adapter['algolia'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.algolia;
-      logger  = log4javascript.getLogger('j1.adapter.algolia');
-
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
@@ -272,7 +273,8 @@ j1.adapter['algolia'] = (function (j1, window) {
 
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
-        logger.info('initializing module finished');
+        logger.info('module initialized successfully');
+
       } else {
         $('#algolia-site-search').append('<p class="ml-5 mt-5 mb-5 "> <strong>Algolia Search DISABLED</strong> </p>');
         _this.setState('finished');
@@ -311,20 +313,20 @@ j1.adapter['algolia'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.algolia.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.algolia.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -103,39 +103,28 @@ j1.adapter['attic'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.attic;
+      logger  = log4javascript.getLogger('j1.adapter.attic');
+
       // initialize state flag
-      j1.adapter.attic.state = 'pending';
+      _this.state = 'pending';
 
       // create seetings object from frontmatterOptions
       var frontmatterOptions = options != null ? $.extend({}, options) : {};
 
       // Save frontmatterOptions in the j1 namespace
       // to be used later by j1.template.init() to load the header
-      j1.adapter.attic['frontmatterOptions'] = frontmatterOptions;
-
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.attic;
-      logger  = log4javascript.getLogger('j1.adapter.attic');
+      _this['frontmatterOptions'] = frontmatterOptions;
 
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
-      {% comment %} Loading headers if j1.template.init() loaded all data objects
-      DISABLED all DEPENDENCIES to NOT delay the render of a page (SEO)
-      -------------------------------------------------------------------------- {% endcomment %}
-      // var dependencies_met_attic_adapter = setInterval(function() {
-      //   if (typeof j1.colors !== 'undefined' && typeof j1.fonts !== 'undefined') {
-      //     _this.loadHeader(frontmatterOptions);
-      //     // clear interval checking
-      //     clearInterval(dependencies_met_attic_adapter);
-      //   }
-      // }, 25); // END 'dataLoaded'
-
       _this.loadHeader(frontmatterOptions);
-
-      return true;
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -143,7 +132,7 @@ j1.adapter['attic'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     loadHeader: function () {
 
-      var frontmatterOptions = j1.adapter.attic.frontmatterOptions;
+      var frontmatterOptions = _this.frontmatterOptions;
 
       {% comment %} Load data from header config (yaml data file)
       -------------------------------------------------------------------------- {% endcomment %}
@@ -243,6 +232,9 @@ j1.adapter['attic'] = (function (j1, window) {
                   $('.attic-caption').html(badgeHTML).show();
                 }
               }
+              _this.setState('finished');
+              logger.info('state: ' + _this.getState());
+              logger.info('module initialized successfully');
             });
 
             {% comment %} Detect how show should run (only once|infinite loop)
@@ -477,12 +469,12 @@ j1.adapter['attic'] = (function (j1, window) {
             var attic_style = '';
 
             // Initialze header background gradient
-            attic_style += '<style> .attic { ';
-            attic_style += 'background-image: -webkit-gradient(linear, left top, left bottom, from(' +atticOptions.background_color_1+ '), to(' +atticOptions.background_color_2+ '));';
-            attic_style += 'background-image: -webkit-linear-gradient(top, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%);';
-            attic_style += 'background-image: -o-linear-gradient(top, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%);';
-            attic_style += 'background-image: linear-gradient(to bottom, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%);';
-            attic_style += 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' +atticOptions.background_color_1+ '", endColorstr="' +atticOptions.background_color_2+ '", GradientType=0);';
+            attic_style += '<style> .attic { '
+            attic_style += 'background-image: -webkit-gradient(linear, left top, left bottom, from(' +atticOptions.background_color_1+ '), to(' +atticOptions.background_color_2+ ')) !important;';
+            attic_style += 'background-image: -webkit-linear-gradient(top, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%) !important;';
+            attic_style += 'background-image: -o-linear-gradient(top, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%) !important;';
+            attic_style += 'background-image: linear-gradient(to bottom, ' +atticOptions.background_color_1+ ' 0%, ' +atticOptions.background_color_2+ ' 100%) !important;';
+            attic_style += 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' +atticOptions.background_color_1+ '", endColorstr="' +atticOptions.background_color_2+ '", GradientType=0) !important;';
             attic_style += '} </style>';
             $('head').append(attic_style);
 
@@ -556,20 +548,20 @@ j1.adapter['attic'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.attic.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.attic.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -100,8 +100,15 @@ j1.adapter['carousel'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.carousel;
+      logger  = log4javascript.getLogger('j1.adapter.carousel');
+
       // initialize state flag
-      j1.adapter.carousel.state = 'pending';
+      _this.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -122,10 +129,7 @@ j1.adapter['carousel'] = (function (j1, window) {
         moduleOptions = j1.mergeData(moduleOptions, settings);
       }
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.carousel;
-      logger  = log4javascript.getLogger('j1.adapter.carousel');
+
 
       _this.setState('started');
       logger.info('state: ' + _this.getState());
@@ -306,20 +310,20 @@ j1.adapter['carousel'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.carousel.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.carousel.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 

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

@@ -68,8 +68,8 @@ j1.adapter['clipboard'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment         = '{{environment}}';
-  var moduleOptions       = {};
+  var environment   = '{{environment}}';
+  var moduleOptions = {};
   var logger;
   var logText;
   var _this;
@@ -84,8 +84,12 @@ j1.adapter['clipboard'] = (function (j1, window) {
     // module initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-      // initialize state flag
-      j1.adapter.clipboard.state = 'pending';
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.clipboard;
+      logger  = log4javascript.getLogger('j1.adapter.clipboard');
 
       // -----------------------------------------------------------------------
       // defaults
@@ -95,11 +99,8 @@ j1.adapter['clipboard'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this   = j1.adapter.clipboard;
-      logger  = log4javascript.getLogger('j1.adapter.clipboard');
+      // initialize state flag
+      _this.state = 'started';
       logText = 'initialization: started';
       logger.info(logText);
 
@@ -119,8 +120,9 @@ j1.adapter['clipboard'] = (function (j1, window) {
           _this.initEventHandler(clipboardJS);
 
           clearInterval(dependencies_met_j1_finished);
-          logText = 'initialization: finished';
-          logger.info(logText);
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
         }
       }, 25); // END dependencies_met_j1_finished
     },
@@ -203,20 +205,20 @@ j1.adapter['clipboard'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.clipboard.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.clipboard.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -0,0 +1,204 @@
+---
+regenerate: true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/cookiebar.js
+ # Liquid template to create the Template Adapter for J1 Cookiebar
+ #
+ # Product/Info:
+ # http://jekyll.one
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid var initialization
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment           = site.environment %}
+{% assign modules               = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookiebar_settings    = modules.cookiebar.settings %}
+{% assign cookiebar_defaults    = modules.defaults.cookiebar.defaults %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign cookiebar_options     = cookiebar_defaults | merge: cookiebar_settings %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/cookiebar.js
+ # JS Adapter for Cookiebar
+ #
+ # Product/Info:
+ # http://jekyll.one
+ # http://www.primebox.co.uk/projects/jquery-cookiebar/
+ #
+ # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2016 Ant Parsons (primebox.co.uk)
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # jQuery Cookibar is licensed under Creative Commons Attribution 3.0 Unported License.
+ # For details, see http://www.primebox.co.uk/projects/jquery-cookiebar/
+ #
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+'use strict';
+
+{% comment %} Main
+--------------------------------------------------------------- {% endcomment %}
+j1.adapter['cookiebar'] = (function (j1, window) {
+
+  var environment   = '{{environment}}';
+  var moduleOptions = {};
+  var _this;
+  var logger;
+  var logText;
+
+  // ---------------------------------------------------------------------------
+  // Helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // Initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.algolia',
+        generated:   '{{site.time}}'
+      }, options);
+
+      {% comment %} Load module config from yml data
+      -------------------------------------------------------------------------- {% endcomment %}
+      // Load  module DEFAULTS|CONFIG
+      /* eslint-disable */
+      moduleOptions = $.extend({}, {{cookiebar_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
+
+      if (typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
+      }
+
+      // -----------------------------------------------------------------------
+      // initializer
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.cookiebar;
+      logger  = log4javascript.getLogger('j1.adapter.cookiebar');
+
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
+
+      j1.core.cookiebar.init({
+        expireDays:             {{ cookiebar_options.expireDays | json }},
+        renewOnVisit:           {{ cookiebar_options.renewOnVisit | json }},
+        forceShow:              {{ cookiebar_options.forceShow | json }},
+        domain:                 {{ cookiebar_options.domain | json }},
+        referrer:               {{ cookiebar_options.referrer | json }}
+      });
+
+      j1.xhrData(moduleOptions, 'j1.adapter.cookiebar', 'data_loaded');
+
+      // ---------------------------------------------------------------------
+      // Initialize events if all modals loaded
+      // ---------------------------------------------------------------------
+      var dependencies_met_modals_loaded = setInterval (function () {
+        if (j1.xhrDataState['#{{cookiebar_options.xhr_container_id}}'] == 'success') {
+          logger.info('load HTML data (AJAX): finished');
+          j1.core.cookiebar.eventHandler(moduleOptions);
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('initializing module finished');
+          clearInterval(dependencies_met_modals_loaded);
+        }
+        if (j1.xhrDataState['#{{cookiebar_options.xhr_container_id}}'] == 'not loaded') {
+          logger.error('load HTML data (AJAX): failed');
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('initializing module finished');
+          clearInterval(dependencies_met_modals_loaded);
+        }
+      }, 25); // END dependencies_met_modals_loaded
+    }, // END init
+
+
+    // -------------------------------------------------------------------------
+    // messageHandler: MessageHandler for J1 CookieConsent module
+    // Manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
+      logText = 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info(message.text);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    } // END getState
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{{ cache | strip_empty_lines }}
+{% assign cache = nil %}