j1-template 2020.0.10 → 2020.0.15

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -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 %}
@@ -50,6 +49,11 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign attic_options        = attic_defaults | merge: attic_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/attic.js
@@ -99,36 +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
-      -------------------------------------------------------------------------- {% 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'
-
-      return true;
+      _this.loadHeader(frontmatterOptions);
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -136,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 %}
@@ -236,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)
@@ -434,15 +433,23 @@ j1.adapter['attic'] = (function (j1, window) {
 
             {% comment %} Resolve symbolic color names
             -------------------------------------------------------------------- {% endcomment %}
-            atticOptions.title_color         = j1.setColorData(atticOptions.title_color);
-            atticOptions.tagline_color       = j1.setColorData(atticOptions.tagline_color);
-            atticOptions.background_color_1  = j1.setColorData(atticOptions.background_color_1);
-            atticOptions.background_color_2  = j1.setColorData(atticOptions.background_color_2);
+            // atticOptions.title_color         = j1.setColorData(atticOptions.title_color);
+            // atticOptions.tagline_color       = j1.setColorData(atticOptions.tagline_color);
+            // atticOptions.background_color_1  = j1.setColorData(atticOptions.background_color_1);
+            // atticOptions.background_color_2  = j1.setColorData(atticOptions.background_color_2);
+
+            atticOptions.title_color         = atticOptions.title_color;
+            atticOptions.tagline_color       = atticOptions.tagline_color;
+            atticOptions.background_color_1  = atticOptions.background_color_1;
+            atticOptions.background_color_2  = atticOptions.background_color_2;
 
             {% comment %} Resolve symbolic font sizes names
             -------------------------------------------------------------------- {% endcomment %}
-            atticOptions.title_size          = j1.setFontSize(atticOptions.title_size);
-            atticOptions.tagline_size        = j1.setFontSize(atticOptions.tagline_size);
+            // atticOptions.title_size          = j1.setFontSize(atticOptions.title_size);
+            // atticOptions.tagline_size        = j1.setFontSize(atticOptions.tagline_size);
+
+            atticOptions.title_size          = atticOptions.title_size;
+            atticOptions.tagline_size        = atticOptions.tagline_size;
 
             {% comment %} Add header CSS classes
             -------------------------------------------------------------------- {% endcomment %}
@@ -462,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);
 
@@ -541,24 +548,28 @@ 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);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -31,6 +31,12 @@ regenerate:                             true
 {% assign template_version    = site.version %}
 {% assign slider_id           = '' %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 
@@ -94,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
@@ -116,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());
@@ -300,25 +310,29 @@ 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
 
 })(j1, window);
 
 {% endcapture %}
-{{cache | strip_empty_lines}}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

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

@@ -0,0 +1,232 @@
+---
+regenerate: true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/clipboard.js
+ # Liquid template to adapt Clipboard for J1 Template
+ #
+ # Product/Info:
+ # https://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 }}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment   = site.environment %}
+
+
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/clipboard.js
+ # JS Adapter for Clipboard
+ #
+ # Product/Info:
+ # {{site.data.template_settings.theme_author_url}}
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see {{site.data.template_settings.theme_author_url}}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # -----------------------------------------------------------------------------
+ # Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+
+j1.adapter['clipboard'] = (function (j1, window) {
+
+  // ---------------------------------------------------------------------------
+  // globals
+  // ---------------------------------------------------------------------------
+  var environment   = '{{environment}}';
+  var moduleOptions = {};
+  var logger;
+  var logText;
+  var _this;
+  var clipboardJS;
+
+  // ---------------------------------------------------------------------------
+  // main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // module initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.clipboard;
+      logger  = log4javascript.getLogger('j1.adapter.clipboard');
+
+      // -----------------------------------------------------------------------
+      // defaults
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.clipboard',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // initialize state flag
+      _this.state = 'started';
+      logText = 'initialization: started';
+      logger.info(logText);
+
+      // initialize ClipboardJS if page is loaded
+      var dependencies_met_j1_finished = setInterval(function() {
+        if ( j1.getState() == 'finished' ) {
+          logText = 'create clipboard';
+          logger.info(logText);
+
+          clipboardJS = new ClipboardJS('.btn-clipboard', {
+            target: function target(trigger) {
+              return trigger.parentNode.nextElementSibling;
+            }
+          });
+
+          _this.initClipButtons();
+          _this.initEventHandler(clipboardJS);
+
+          clearInterval(dependencies_met_j1_finished);
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
+        }
+      }, 25); // END dependencies_met_j1_finished
+    },
+
+    // -------------------------------------------------------------------------
+    // initClipboard
+    // Create copy-to-clipboard for all pages
+    // -------------------------------------------------------------------------
+    initClipButtons: function () {
+      // insert copy to clipboard button before all elements having a
+      // class of ".highlight" assigned to (e.g. Asciidoc source blocks)
+      $('.highlight').each(function () {
+        // Check if no clipboard should be applied
+        var isNoClip = $(this).closest('.noclip');
+        if ( isNoClip.length == 0) {
+          var btnHtml = '<div class="j1-clipboard"><span class="btn-clipboard j1-tooltip" data-toggle="tooltip" data-placement="left" title="Copy to clipboard">Copy</span></div>';
+          $(this).before(btnHtml);
+          $('.btn-clipboard').tooltip();
+        }
+      });
+    }, // END initClipboard
+
+    // -------------------------------------------------------------------------
+    // Event handler
+    // -------------------------------------------------------------------------
+    initEventHandler: function (clipboard) {
+      // Manage clipboard events
+      clipboard.on('success', function (e) {
+        $(e.trigger).attr('title', 'copied!').tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
+        var logger = log4javascript.getLogger('j1.initClipboard');
+        var logText = 'initialization copy-to-clipboard sucessfull';
+        logger.debug(logText);
+        /* Cleanup clipped data for trailing numbers */
+        var splitted = e.text.split('\n');
+        var concat;
+        var i;
+        for (i=0; i<splitted.length; i++) {
+          concat += splitted[i].replace(/^\s+\d+/, '');
+        }
+        e.clearSelection();
+      });
+      clipboard.on('error', function (e) {
+        var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'press \u2318 to copy' : 'press ctrl-c to copy';
+        logger = log4javascript.getLogger('j1.initClipboard');
+        logText = 'initialization copy-to-clipboard failed, fallback used.';
+        logger.warn(logText);
+        $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'copy to clipboard').tooltip('_fixTitle');
+      });
+    },
+
+    // -------------------------------------------------------------------------
+    // messageHandler
+    // Manage messages (paylods) 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);
+      }
+      if (message.type === 'command' && message.action === 'status') {
+        logger.info('messageHandler: received - ' + message.action);
+      }
+
+      //
+      // 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 %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}