j1-template 2020.0.19 → 2020.0.25

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

@@ -107,11 +107,13 @@ j1.adapter['mmenu'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment   = '{{environment}}';
-  var dclFinished   = false;
-  var moduleOptions = {};
-  var themerOptions = {};
-  var cookie_names  = j1.getCookieNames();
+  var environment     = '{{environment}}';
+  var dclFinished     = false;
+  var moduleOptions   = {};
+  var navMenuOptions  = {};
+  var themerOptions   = {};
+  var cookie_names    = j1.getCookieNames();
+  var themerEnabled   = {{themer_options.enabled}};
   var user_state;
   var user_session;
   var user_data;
@@ -156,12 +158,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
       // options loader
       // -----------------------------------------------------------------------
       /* eslint-disable */
-      var navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      themerOptions  = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
       /* eslint-enable */
       var xhr_data_path;
       var menu_id;
 
-      themerOptions = $.extend({}, {{themer_options | replace: '=>', ':' }});
       // save config settings into the mmenu object for global access
       //
       _this['navMenuOptions'] = navMenuOptions;
@@ -316,10 +318,14 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
 
-            // remotely loaded (BootSwatch) themes (from API)
+            // jadams, 2020-09-30: loading the menues (themes)
+            // from Bootswatch API (set localFeed EMPTY)
             $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-            // locally loaded themes (from json file)
-            $('#local_themes_mmenu').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
+            // load (local) J1 themes (default settings) from JSON data
+            $('#local_themes_mmenu').bootstrapThemeSwitcher();
+
+            $('#{{item.menu.content.id}}').show();
+            logger.info('initializing mmenu finished on id: #{{menu_id}}');
             logger.info('met dependencies for: {{menu_id}} loaded');
             clearInterval(dependencies_met_{{menu_id}}_loaded);
             $('#{{item.menu.content.id}}').show();

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

@@ -1,12 +1,12 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/navigator.js (new-2)
+ # ~/assets/themes/j1/adapter/js/navigator.js
  # Liquid template to adapt Navigator Core functions
  #
  # Product/Info:
@@ -53,10 +53,11 @@ regenerate: true
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 
+
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config               = site.data.template_settings %}
+{% assign template_config               = site.data.j1_config %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
 
@@ -246,7 +247,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       navAuthMAnagerConfig                          = $.extend({}, {{authentication_options | replace: '=>', ':' }});
       authClientEnabled                             = navAuthMAnagerConfig.enabled;
 
-      themerOptions                                 = $.extend({}, {{themer_options | replace: '=>', ':' }});
+      themerOptions                                 = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
       // Merge|Overload module CONFIG by DEFAULTS
       //
@@ -331,13 +332,17 @@ j1.adapter['navigator'] = (function (j1, window) {
             _this.navMenuOptions
           );
 
+          // _this.delayShowMenu( 200 );
+
           // cast text-based booleans
           // themerEnabled = ({{themer_options.enabled }} === 'true');
 
-          // load themes (to menu) if page is finished
-          var dependencies_met_page_finished = setInterval(function() {
-            if (j1.getState() == 'finished') {
-              if ({{themer_options.enabled }}) {
+          // load themes (to menu) if themer is enabled|finished
+          if (themerEnabled) {
+            var dependencies_met_page_finished = setInterval(function() {
+              // jadams, 2020-10-03: NOT needed to wait for j1 finished
+//            if (j1.getState() == 'finished') {
+              if (j1.adapter.themer.getState() == 'finished') {
                 // initialize theme switcher menus
                 logText = 'theme switcher detect: enabled';
                 logger.info(logText);
@@ -350,20 +355,20 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logText = 'load local themes (json file)';
                 logger.info(logText);
                 $('#local_themes').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
-              } else {
-                logText = 'theme switcher detect: disabled';
-                logger.info(logText);
+                clearInterval(dependencies_met_page_finished);
               }
-              clearInterval(dependencies_met_page_finished);
-            }
-            _this.setState('initialized');
-          }, 25); // END 'dependencies_met_page_finished'
+              _this.setState('initialized');
+            }, 25); // END 'dependencies_met_page_finished'
+          } else {
+            logText = 'theme switcher detected as: disabled';
+            logger.info(logText);
+          }
 
           // -----------------------------------------------------------------
           // event handler|css styles
           // -----------------------------------------------------------------
           // continue if Theme CSS is applied
-          var dependencies_met_adapter_finished = setInterval(function() {
+          var dependencies_met_themer_finished = setInterval(function() {
             if (themerEnabled) {
               if (j1.adapter.themer.getState() === 'finished') {
                 _this.setState('processing');
@@ -382,7 +387,7 @@ j1.adapter['navigator'] = (function (j1, window) {
                     clearInterval(dependencies_met_page_finished);
                   }
                   logger.info('initializing dynamic CSS styles: finished');
-                }, 25); // END 'dependencies_met_adapter_finished'
+                }, 25); // END 'dependencies_met_page_finished'
 
                 logger.info('init auth client');
                 _this.initAuthClient(_this.navAuthManagerConfig);
@@ -391,7 +396,7 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logger.info('state: ' + _this.getState());
                 logger.info('module initialized successfully');
                 logger.info('met dependencies for: j1');
-                clearInterval(dependencies_met_adapter_finished);
+                clearInterval(dependencies_met_themer_finished);
               }
             } else {
               _this.setState('processing');
@@ -411,9 +416,9 @@ j1.adapter['navigator'] = (function (j1, window) {
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
               logger.info('met dependencies for: themer');
-              clearInterval(dependencies_met_adapter_finished);
+              clearInterval(dependencies_met_themer_finished);
             }
-          }, 25); // END 'dependencies_met_adapter_finished'
+          }, 25); // END 'dependencies_met_themer_finished'
           logger.info('met dependencies for: themer');
           clearInterval(dependencies_met_load_menu_finished);
         }
@@ -733,7 +738,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       {% comment %} Tag Cloud styles
       -------------------------------------------------------------------------- {% endcomment %}
       $('head').append('<style>.tag-cloud ul li a {background-color: ' +bg_scrolled+ ' !important;}</style>');
-      $('head').append('<style>.tag-cloud ul li a:hover {background-color: #212121 !important;}</style>');
+      // $('head').append('<style>.tag-cloud ul li a:hover {background-color: #212121 !important;}</style>');
 
       {% comment %} Toccer styles
       -------------------------------------------------------------------------- {% endcomment %}
@@ -747,7 +752,6 @@ j1.adapter['navigator'] = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       $('head').append('<style>.nav-pills .nav-link.active, .nav-pills .show > .nav-link {background-color: ' +bg_scrolled+ ' !important;}</style>');
 
-
       return true;
     }, // END setCSS
 
@@ -756,49 +760,50 @@ j1.adapter['navigator'] = (function (j1, window) {
     //  delay all dropdown menu to open for "delay" time
     //  See: http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
-    delayShowMenu: function () {
+    delayShowMenu: function ( menuOpenDelay ) {
       var logger      = log4javascript.getLogger('j1.adapter.navigator.delayShowMenu');
-      var theTimer    = 0;
-      var theElement  = null;
+      var theTimer = 0;
+      var theElement = null;
+      var theLastPosition = {x:0,y:0};
 
       logText ='entered delayShowMenu';
       logger.info(logText);
 
-      $('#navigator_nav_menu')
-        .find('li.dropdown.nav-item')
-        .on('mouseenter', function (inEvent) {
-          theElement = $(this);
-          if (theElement) theElement.removeClass('open');
-          //if (theElement) theElement.css("display", "none");
-          //window.clearTimeout(theTimer);
-
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //theElement.css("display", "block");
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mousemove', function (inEvent) {
-          if (theElement.hasClass('open')) return true;
-          //window.clearTimeout(theTimer);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mouseleave', function (inEvent) {
-          //window.clearTimeout(theTimer);
-          theElement = $(this);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.removeClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        });
-
-        return true;
+      // $('#navigator_nav_menu')
+      //   .find('li.dropdown.nav-item')
+
+      $('[data-toggle]').closest('li')
+      .on('mouseenter', function (inEvent) {
+        if (theElement) theElement.removeClass('open');
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mousemove', function (inEvent) {
+        if(Math.abs(theLastPosition.x - inEvent.ScreenX) > 4 ||
+           Math.abs(theLastPosition.y - inEvent.ScreenY) > 4) {
+          theLastPosition.x = inEvent.ScreenX;
+          theLastPosition.y = inEvent.ScreenY;
+          return;
+        }
+        if (theElement.hasClass('open')) return;
+        window.clearTimeout(theTimer);
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mouseleave', function (inEvent) {
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+        theTimer = window.setTimeout(function () {
+          theElement.removeClass('open');
+        }, menuOpenDelay);
+      });
+
+      return true;
     }, // END delayShowMenu
 
     // -------------------------------------------------------------------------
@@ -851,6 +856,22 @@ j1.adapter['navigator'] = (function (j1, window) {
   }; // END return
 })(j1, window);
 
+{% comment %} process adapter COMPRESSED for production DISABLED
+NOTE: for unknown reason, minifyJS detect JS/ES6 code
+      SyntaxError: Unexpected token: punc ())
+--------------------------------------------------------------------------------
+{% assign production = true %}
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} process adapter UNCOMPRESSED
+-------------------------------------------------------------------------------- {% endcomment %}
 {% endcapture %}
 {{ cache | strip_empty_lines }}
 {% assign cache = nil %}

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

@@ -0,0 +1,246 @@
+---
+regenerate:                             false
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/rouge.js
+ # Liquid template to adapt J1 Highlighter (Rouge)
+ #
+ # 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 }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config   = site.data.j1_config %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/rouge.js
+ # J1 Adapter for rouge
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// https://github.com/jirutka/asciidoctor-rouge/issues/9
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+j1.adapter['rouge'] = (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;
+  var themeCss;
+  var _this;
+  var logger;
+  var logText;
+
+  var templateOptions = $.extend({}, {{template_config | replace: 'nil', 'null' | replace: '=>', ':' }});
+
+  // ---------------------------------------------------------------------------
+  // Helper functions
+  // ---------------------------------------------------------------------------
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // helper functions
+    // -------------------------------------------------------------------------
+
+    // -------------------------------------------------------------------------
+    // Initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.rouge;
+      logger  = log4javascript.getLogger('j1.adapter.rouge');
+
+      // initialize state flag
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.rouge',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // rouge initializer
+      // -----------------------------------------------------------------------
+      var log_text = 'Rouge is being initialized';
+      logger.info(log_text);
+
+      // Detect|Set J1 UserState
+      user_state_detected = j1.existsCookie(cookie_user_state_name);
+      if (user_state_detected) {
+        user_state            = j1.readCookie(cookie_user_state_name);
+        themeCss              = user_state.theme_css;
+        var darkTheme         = themeCss.includes('dark') ||
+                                themeCss.includes('cyborg') ||
+                                themeCss.includes('darkly') ||
+                                themeCss.includes('slate') ||
+                                themeCss.includes('superhero');
+      } else {
+        log_text = 'user_state cookie not found';
+        logger.warn(log_text);
+      }
+
+      var dependencies_met_j1_finished = setInterval(function() {
+        if (j1.getState() == 'finished') {
+         $('.dropdown-menu a').click(function(){
+            $('#selected').html("Current Selection: <div class='bg-primary mt-1 p-2'>"+$(this).text()+"</div>");
+         });
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          clearInterval(dependencies_met_j1_finished);
+        } // END dependencies_met_j1_finished
+      }, 25);
+
+      var dependencies_met_rouge_theme_loaded = setInterval (function () {
+        if (j1.adapter.rouge.getState() === 'finished') {
+          if ( darkTheme ) {
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_dark)
+          } else {
+            j1.adapter.rouge.reaplyStyles(templateOptions.rouge.theme_light)
+          }
+          clearInterval(dependencies_met_rouge_theme_loaded);
+        }
+      }, 25); // END 'dependencies_met_rouge_theme_loaded'
+
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // load|apply new rouge theme
+    // -------------------------------------------------------------------------
+    reaplyStyles: function (themename) {
+      _this.removeAllRougeStyles();
+      _this.addStyle(themename);
+      return true;
+    },
+
+    // -------------------------------------------------------------------------
+    // remove existing rouge theme CSS (from section <head>)
+    // -------------------------------------------------------------------------
+    removeAllRougeStyles: function () {
+      $('link[rel=stylesheet][href*="/assets/themes/j1/modules/rouge"]').remove();
+    },
+
+    // -------------------------------------------------------------------------
+    // add rouge theme CSS (to section <head>)
+    // -------------------------------------------------------------------------
+    addStyle: function (themename) {
+      $('<link>').attr('rel','stylesheet')
+      .attr('type','text/css')
+      .attr('href','/assets/themes/j1/modules/rouge/css/' +themename+ '/theme.css')
+      .appendTo('head');
+    },
+
+    // -------------------------------------------------------------------------
+    // 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 %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}