j1-template 2020.0.12 → 2020.0.17

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

@@ -35,20 +35,17 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
 {% assign template_config   = site.data.template_settings %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment       = site_config.environment %}
-{% assign algolia_config    = site_config.algolia %}
+{% assign algolia_config    = site.algolia %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 
-
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -103,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
@@ -114,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');
@@ -274,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');
@@ -313,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

@@ -36,7 +36,6 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config           = site %}
 {% assign template_config       = site.data.template_settings %}
 {% assign blocks                = site.data.blocks %}
 {% assign modules               = site.data.modules %}
@@ -104,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
 
     // -------------------------------------------------------------------------
@@ -144,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 %}
@@ -244,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)
@@ -478,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);
 
@@ -557,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/back2top.js

@@ -0,0 +1,233 @@
+---
+regenerate: true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/back2top.js
+ # Liquid template to adapt Back2Top Core functions
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # http://dynamicdrive.com/dynamicindex3/scrolltop.htm
+ #
+ # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2009 dynamicdrive.com
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture select_color %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
+
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.template_settings %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign back2top_defaults = modules.defaults.back2top.defaults %}
+{% assign back2top_settings = modules.back2top.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign back2top_options  = back2top_defaults | merge: back2top_settings %}
+{% assign active_color      = back2top_options.active_color %}
+{% assign background_color  = back2top_options.background_color %}
+{% assign back2top_icon     = back2top_options.icon %}
+{% assign color             = back2top_options.color %}
+
+{% if back2top_options.icon_family == 'MDI' %}
+  {% assign back2top_icon_family = 'Material Design Icons' %}
+{% elsif moduleOptions.icon_family == 'FA' %}
+  {% assign back2top_icon_family = 'FontAweSome' %}
+{% else %}
+  {% assign back2top_icon_family = 'Material Design Icons' %}
+{% endif %}
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ #  ~/assets/themes/j1/adapter/js/back2top.js
+ #  JS Adapter for J1 Back2Top
+ #
+ #  Product/Info:
+ #  https://jekyll.one
+ #  http://dynamicdrive.com/dynamicindex3/scrolltop.htm
+ #
+ #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2009 dynamicdrive.com
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  For details, see https://jekyll.one
+ #
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+'use strict';
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+j1.adapter['back2top'] = (function (j1, window) {
+
+  {% comment %} Set global variables
+  ------------------------------------------------------------------------------ {% endcomment %}
+  var environment    = '{{environment}}';
+  var moduleOptions  = {};
+  var _this;
+  var logger;
+  var logText;
+
+  // ---------------------------------------------------------------------------
+  // Helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // Initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+      // initialize state flag
+      j1.adapter.back2top.state = 'pending';
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.back2top',
+        generated:   '{{site.time}}'
+      }, options );
+
+      {% comment %} Set global variables
+      -------------------------------------------------------------------------- {% endcomment %}
+      _this   = j1.adapter.back2top;
+      logger  = log4javascript.getLogger('j1.adapter.back2top');
+
+      {% comment %} Load module config from yml data
+      -------------------------------------------------------------------------- {% endcomment %}
+      // Load  module DEFAULTS|CONFIG
+      moduleOptions = $.extend({}, {{back2top_options | replace: '=>', ':' | replace: 'nil', '""'}});
+
+      if ( typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
+      }
+
+      if (moduleOptions.enabled) {
+        _this.setState('started');
+        logger.info('state: ' + _this.getState());
+        logger.info('module is being initialized');
+
+        // save config settings into the mmenu object for global access
+        //
+        _this['moduleOptions'] = moduleOptions;
+        _this.setCss();
+
+        var dependencies_met_navigator = setInterval(function() {
+          if (j1.getState() == 'finished') {
+            logger.info('met dependencies for: j1');
+            j1.core.back2top.init(moduleOptions);
+            _this.setState('finished');
+            logger.info('state: ' + _this.getState());
+            clearInterval(dependencies_met_navigator);
+          }
+        }, 25);
+      } else {
+        _this.setState('finished');
+        logger.info('state: ' + _this.getState());
+        logger.warn('module disabled');
+      }
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // Set dynamic styles for Back2Top
+    // -------------------------------------------------------------------------
+    setCss: function () {
+      var bg_primary  = j1.getStyleValue('body', 'color');
+
+      $('head').append('<style>#topcontrol {background: ' +moduleOptions.background_color+ ';}</style>');
+      $('head').append('<style>#topcontrol:hover {background: ' +moduleOptions.active_color+ ';}</style>');
+      $('head').append('<style>#topcontrol:after {content: "\\{{back2top_icon}}"; font-family: {{back2top_icon_family}};}</style>');
+    }, // END setCss
+
+    // -------------------------------------------------------------------------
+    // 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);              // multiline
+      var json_message = JSON.stringify(message);
+
+      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
+    // Set the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      j1.adapter.back2top.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return j1.adapter.back2top.state;
+    } // END state
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{cache| minifyJS }}
+{% else %}
+  {{cache| strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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