j1-template 2020.0.9 → 2020.0.14

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -19,7 +19,7 @@ regenerate:                             false
  #
  # -----------------------------------------------------------------------------
  # Test data:
- #  {{ config | debug }}
+ #  {{config| debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -37,7 +37,6 @@ regenerate:                             false
 
 {% 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 %}
@@ -49,7 +48,7 @@ regenerate:                             false
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign themer_options    = themer_defaults | merge: themer_settings %}
+{% assign themer_options    = themer_defaults| merge: themer_settings %}
 {% assign default_theme     = template_config.bootstrap.default_theme %}
 {% assign vendor_css        = "vendor" %}
 {% assign theme_base        = "core/css" %}
@@ -61,6 +60,10 @@ regenerate:                             false
   {% assign theme_ext       = "min.css" %}
 {% endif %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 /*
  # -----------------------------------------------------------------------------
@@ -86,23 +89,28 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['themer'] = (function (j1, window) {
-
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment            = '{{environment}}';
-  var moduleOptions          = {};
-  var user_state             = {};
-  var cookie_names           = j1.getCookieNames();
-  var cookie_user_state_name = cookie_names.user_state;
-  var user_state_detected    = false;
-  var id                     = 'default';
-  var cssFile                = '{{themer_options.defaultCssFile}}';
-  var interval_count         = 0;
-  var max_count              = 4;
+  var environment                 = '{{environment}}';
+  var moduleOptions               = {};
+  var user_state                  = {};
+  var cookie_names                = j1.getCookieNames();
+  var cookie_user_state_name      = cookie_names.user_state;
+  var user_state_detected         = false;
+  var id                          = 'default';
+  var cssFile                     = '{{themer_options.defaultCssFile}}';
+  var interval_count              = 0;
+  var max_count                   = 4;
   var user_state_json;
   var user_state_cookie;
   var _this;
@@ -125,7 +133,6 @@ j1.adapter['themer'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
-
   // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
   // Example: getStyleValueFromStyleSheet('bg-primary', 'background-color', 'vendor');
   function styleSheetLoaded(styleSheet) {
@@ -138,10 +145,9 @@ j1.adapter['themer'] = (function (j1, window) {
         return true;;
       }
     }
-    return false;
   }
 
-  {% comment %} Unused
+  {% comment %} Unused code
   ------------------------------------------------------------------------------
   // NOTE: Does not work anymore because of CORS check violation
   // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
@@ -167,27 +173,25 @@ j1.adapter['themer'] = (function (j1, window) {
         return style;
       }
     }
-
-    return null;
   }
   ------------------------------------------------------------------------------ {% endcomment %}
 
-
   // ---------------------------------------------------------------------------
   // Main object
   // ---------------------------------------------------------------------------
   return {
-
     // -------------------------------------------------------------------------
     // initializer
     // -------------------------------------------------------------------------
     init: function () {
-      // initialize state flag
-      j1.adapter.themer.state = 'started';
-
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
       _this     = j1.adapter.themer;
       logger    = log4javascript.getLogger('j1.adapter.themer');
 
+      // initialize state flag
+      _this.state = 'started';
       logger.info('state: ' + _this.getState());
 
       // Detect|Set J1 UserState
@@ -199,15 +203,19 @@ j1.adapter['themer'] = (function (j1, window) {
         themeExtensionCss     = user_state.theme_extension_css;
       }
       if (themeCss) {
-        themeCssHtml          = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";
-        themeExtensionCssHtml = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+        themeCssHtml          = '<link rel="stylesheet" id="' + id + '" href="' + themeCss + '" type="text/css" />';
+        themeExtensionCssHtml = '<link rel="stylesheet" id="' + id +'" href="' + themeExtensionCss + '" type="text/css" />';
       } else {
         themeName             = default_theme_name;
         themeCssHtml          = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
         vendorCssHtml         = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" />';
         $('head').append(vendorCssHtml);
       }
-      $('head').append(themeCssHtml);
+
+      // Don't load Theme CSS twice! (loaded already as resource 'core')
+      if (themeName != default_theme_name) {
+        $('head').append(themeCssHtml);
+      }
 
       // Append|Remove theme extentions
       // TODO: Make default theme name 'Uno' configurable
@@ -221,28 +229,32 @@ j1.adapter['themer'] = (function (j1, window) {
         logger.info('themes detected as: enabled');
         logger.info('theme is being initialized: ' + themeName);
 
-      $.when (
-        $('#ThemeList').bootstrapThemeSwitcher.defaults = {
-          debug:                    {{ themer_options.debug | json }},
-          saveToCookie:             {{ themer_options.saveToCookie | json }},
-          cssThemeLink:             {{ themer_options.cssThemeLink | json }},
-          cookieThemeName:          {{ themer_options.cookieThemeName | json }},
-          cookieDefaultThemeName:   {{ themer_options.cookieDefaultThemeName | json }},
-          cookieThemeCss:           {{ themer_options.cookieThemeCss | json }},
-          cookieThemeExtensionCss:  {{ themer_options.cookieThemeExtensionCss | json }},
-          cookieExpiration:         {{ themer_options.cookieExpiration | json }},
-          cookiePath:               {{ themer_options.cookiePath | json }},
-          defaultCssFile:           {{ themer_options.defaultCssFile | json }},
-          bootswatchApiUrl:         {{ themer_options.bootswatchApiUrl | json }},
-          bootswatchApiVersion:     {{ themer_options.bootswatchApiVersion | json }},
-          loadFromBootswatch:       {{ themer_options.loadFromBootswatch | json }},
-          localFeed:                {{ themer_options.localFeed | json }},
-          excludeBootswatch:        {{ themer_options.excludeBootswatch | json }},
-          includeBootswatch:        {{ themer_options.includeBootswatch | json }},
-          skipIncludeBootswatch:    {{ themer_options.skipIncludeBootswatch | json }}
-        })
-        .then (function() {
-          if (themeName === 'Uno' || themeName === 'Bootstrap') {
+      var dependencies_met_navigator_started = setInterval (function () {
+        if (j1.adapter.navigator.getState() == 'started') {
+          /* eslint-disable */
+          // initialize Bootswatch Theme Switcher
+          $('#ThemeList').bootstrapThemeSwitcher.defaults = {
+            debug:                    {{themer_options.debug|json}},
+            saveToCookie:             {{themer_options.saveToCookie|json}},
+            cssThemeLink:             {{themer_options.cssThemeLink|json}},
+            cookieThemeName:          {{themer_options.cookieThemeName|json}},
+            cookieDefaultThemeName:   {{themer_options.cookieDefaultThemeName|json}},
+            cookieThemeCss:           {{themer_options.cookieThemeCss|json}},
+            cookieThemeExtensionCss:  {{themer_options.cookieThemeExtensionCss|json}},
+            cookieExpiration:         {{themer_options.cookieExpiration|json}},
+            cookiePath:               {{themer_options.cookiePath|json}},
+            defaultCssFile:           {{themer_options.defaultCssFile|json}},
+            bootswatchApiUrl:         {{themer_options.bootswatchApiUrl|json}},
+            bootswatchApiVersion:     {{themer_options.bootswatchApiVersion|json}},
+            loadFromBootswatch:       {{themer_options.loadFromBootswatch|json}},
+            localFeed:                {{themer_options.localFeed|json}},
+            excludeBootswatch:        {{themer_options.excludeBootswatch|json}},
+            includeBootswatch:        {{themer_options.includeBootswatch|json}},
+            skipIncludeBootswatch:    {{themer_options.skipIncludeBootswatch|json}}
+          }
+          /* eslint-enable */
+
+          if (themeName == 'Uno'|| themeName == 'Bootstrap') {
             theme = environment === 'production'
               ? themeName.toLowerCase() + '.min.css'
               : themeName.toLowerCase() + '.css';
@@ -251,24 +263,18 @@ j1.adapter['themer'] = (function (j1, window) {
           }
           logger.info('theme loaded: ' + themeName);
           logger.info('theme file: ' + theme);
+
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
           logger.info('module initialized successfully');
-          var dependencies_colors_loaded = setInterval (function() {
-            if (typeof j1.colors !== 'undefined') {
-              // set general|global theme colors
-              _this.setCss();
-              clearInterval(dependencies_colors_loaded);
-            }
-          }, 25); // END 'dependencies_colors_loaded'
-        });
+          clearInterval(dependencies_met_navigator_started);
+        }
+      }, 25); // END 'dependencies_met_navigator_started'
       {% else %}
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
         logger.info('module detected as: disabled');
-        return true;
       {% endif %}
-
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -277,35 +283,6 @@ j1.adapter['themer'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     setCss: function () {
       var bg_primary                      = j1.getStyleValue('bg-primary', 'background-color');
-
-  //  var admonitionblock_note_color      = j1.getStyleValue('icon-note', 'color');
-  //  var admonitionblock_tip_color       = j1.getStyleValue('icon-tip', 'color');
-  //  var admonitionblock_important_color = j1.getStyleValue('icon-important', 'color');
-  //  var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
-  //  var admonitionblock_caution_color   = j1.getStyleValue('icon-caution', 'color');
-
-      // var admonitionblock_note_color      = j1.getStyleValue('btn-info', 'background-color');
-      // var admonitionblock_tip_color       = j1.getStyleValue('btn-success', 'background-color');
-      // var admonitionblock_important_color = j1.getStyleValue('btn-warning', 'background-color');
-      // var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
-      // var admonitionblock_caution_color   = j1.getStyleValue('btn-danger', 'background-color');
-      //
-      // var tabs_pills_link_color_active    = j1.setColorData('md_blue');         // j1.getStyleValue('btn-info', 'background-color');
-      // var tabs_pills_link_color_hover     = j1.setColorData('md_gray_300');     // j1.getStyleValue('btn-secondary', 'background-color');
-      //
-      // $('head').append('<style>.g-bg-primary { background-color: ' +bg_primary+ ' !important; }</style>');
-      // $('head').append('<style>.mdi-md-bg-primary { color: ' +bg_primary+ '; }</style>');
-      //
-      // $('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
-      // $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
-      //
-      // $('head').append('<style>.icon-note { color: ' +admonitionblock_note_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-tip { color: ' +admonitionblock_tip_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-important { color: ' +admonitionblock_important_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-warning { color: ' +admonitionblock_warning_color+ ' !important; }</style>');
-      // $('head').append('<style>.icon-caution { color: ' +admonitionblock_caution_color+ ' !important; }</style>');
-
-      return true;
     }, // END setCss
 
     // -------------------------------------------------------------------------
@@ -322,37 +299,36 @@ j1.adapter['themer'] = (function (j1, window) {
       //  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()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.themer.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.themer.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/toccer.js

@@ -1,8 +1,8 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
-{% capture j1_cache %}
+{% capture cache %}
 
 {% comment %}
  # -----------------------------------------------------------------------------
@@ -28,23 +28,20 @@ regenerate:                             true
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% 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 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.environment %}
+{% assign template_version  = site.version %}
+
 {% assign toccer_defaults   = modules.defaults.toccer.defaults %}
 {% assign toccer_settings   = modules.toccer.settings %}
 {% assign footer_config     = modules.j1_footer %}
@@ -54,6 +51,11 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/toccer.js
@@ -73,6 +75,12 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -88,26 +96,26 @@ j1.adapter['toccer'] = (function () {
   var logText;
 
   // ---------------------------------------------------------------------------
-  // Helper functions
+  // helper functions
   // ---------------------------------------------------------------------------
 
   // ---------------------------------------------------------------------------
-  // Main object
+  // main object
   // ---------------------------------------------------------------------------
   return {
 
     // -------------------------------------------------------------------------
-    // Initializer
+    // initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-      // initialize state flag
-      j1.adapter.toccer.state = 'pending';
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
       _this   = j1.adapter.toccer;
       logger  = log4javascript.getLogger('j1.adapter.toccer');
 
+      // initialize state flag
       _this.setState('started');
       logger.info('state: ' + _this.getState());
       logger.info('Module is being initialized');
@@ -165,6 +173,7 @@ j1.adapter['toccer'] = (function () {
       // tocbot get fired if HTML portion is loaded (AJAX load finished)
       var dependencies_met_ajax_load_finished = setInterval (function () {
         if ($('#toc_mmenu').length) {
+          /* eslint-disable */
           tocbot.init({
             log:                    {{ toccer_options.log | json }},
             activeLinkColor:        {{ toccer_options.activeLinkColor | json }},
@@ -193,6 +202,7 @@ j1.adapter['toccer'] = (function () {
             headingsOffset:         1,
             throttleTimeout:        {{ toccer_options.throttleTimeout | json }}
           });
+          /* eslint-enable */
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished
@@ -226,22 +236,28 @@ j1.adapter['toccer'] = (function () {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.toccer.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState()
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.toccer.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);
 
 {% endcapture %}
-{{ j1_cache | strip_empty_lines }}
-{% assign j1_cache = nil %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}