j1-template 2020.0.13 → 2020.0.14

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

@@ -99,8 +99,18 @@ j1.adapter['searcher'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this   = j1.adapter.searcher;
+      logger  = log4javascript.getLogger('j1.adapter.searcher');
+
       // initialize state flag
-      j1.adapter.searcher.state = 'pending';
+      _this.setState('pending');
+      logger.info('state: ' + _this.getState());
+      logger.info('Module is being started');
+
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -110,11 +120,6 @@ j1.adapter['searcher'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.searcher;
-      logger  = log4javascript.getLogger('j1.adapter.searcher');
-
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
@@ -147,6 +152,7 @@ j1.adapter['searcher'] = (function (j1, window) {
 
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
+        logger.info('module initialized successfully');
       } else {
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
@@ -184,20 +190,20 @@ j1.adapter['searcher'] = (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.searcher.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.searcher.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);

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

@@ -83,10 +83,11 @@ j1.adapter['ssm'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment         = '{{environment}}';
-  var dclFinished         = false;
-  var moduleOptions       = {};
-  var cookie_names        = j1.getCookieNames();
+  const isMobile    = j1.core.isMobile();
+  var environment   = '{{environment}}';
+  var dclFinished   = false;
+  var moduleOptions = {};
+  var cookie_names  = j1.getCookieNames();
   var user_state;
   var user_session;
   var user_data;
@@ -95,7 +96,7 @@ j1.adapter['ssm'] = (function (j1, window) {
   var _this;
   var logger;
   var logText;
-  const isMobile = j1.core.isMobile();
+
 
   // ---------------------------------------------------------------------------
   // helper functions
@@ -111,11 +112,21 @@ j1.adapter['ssm'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function (options) {
 
-      // create seetings object from frontmatterOptions
-      var frontmatterOptions = options != null ? $.extend({}, options) : {};
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
+      _this         = j1.adapter.ssm;
+      logger        = log4javascript.getLogger('j1.adapter.ssm');
+      sect12Nodes   = $('[class$="sect1"],[class$="sect2"');
+      sect1Nodes    = $('[class$="sect1"]');
 
       // initialize state flag
-      j1.adapter.ssm.state = 'pending';
+      _this.setState('started');
+      logger.info('set module state to: ' + _this.getState());
+      logger.info('module is being initialized');
+
+      // create settings object from frontmatterOptions
+      var frontmatterOptions = options != null ? $.extend({}, options) : {};
 
       // -----------------------------------------------------------------------
       // defaults
@@ -125,14 +136,6 @@ j1.adapter['ssm'] = (function (j1, window) {
         generated:   '{{site.time}}'
       }, options);
 
-      // -----------------------------------------------------------------------
-      // globals
-      // -----------------------------------------------------------------------
-      _this         = j1.adapter.ssm;
-      logger        = log4javascript.getLogger('j1.adapter.ssm');
-      sect12Nodes   = $('[class$="sect1"],[class$="sect2"');
-      sect1Nodes    = $('[class$="sect1"]');
-
       // -----------------------------------------------------------------------
       // options loader
       // -----------------------------------------------------------------------
@@ -153,11 +156,7 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       // save config settings into the mmenu object for global access
       //
-      j1.adapter.ssm['moduleOptions'] = moduleOptions;
-
-      _this.setState('started');
-      logger.info('set module state to: ' + _this.getState());
-      logger.info('module is being initialized');
+      _this['moduleOptions'] = moduleOptions;
 
       // jadams, 2020-06-24: Set max_count to 100 what cause to wait 2.5s
       // for J1 Navigator to finish (init)
@@ -170,14 +169,14 @@ j1.adapter['ssm'] = (function (j1, window) {
         if ( j1.adapter.navigator.getState() == 'finished' ) {
           logger.info('dependencies of module navigator met for: mmenu');
           logger.info('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          j1.core.ssm.init (moduleOptions);
+          // j1.core.ssm.init (moduleOptions);
           _this.ssmLoader(moduleOptions);
           clearInterval(dependencies_met_navigator);
         }
         if (interval_count > max_count) {
           logger.warn('dependency check failed for module: navigator');
           logger.warn('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
-          j1.core.ssm.init (moduleOptions);
+          // j1.core.ssm.init (moduleOptions);
           _this.ssmLoader(moduleOptions);
           clearInterval(dependencies_met_navigator);
         }
@@ -201,50 +200,51 @@ j1.adapter['ssm'] = (function (j1, window) {
 
       {% assign id_list = "" %}
 
-      $.when (
-        {% assign menu_id       = ssm_options.xhr_container_id %}
-        {% assign xhr_data_path = ssm_options.xhr_data_path %}
-        j1.xhrData (
-          'j1.adapter.ssm', {
-          xhr_container_id: '{{menu_id}}',
-          xhr_data_path:    '{{xhr_data_path}}' },
-          'data_loaded')
-      ).done (function (ssm_html_loaded) {
-        // ---------------------------------------------------------------------
-        // Initialize MMenu Navs and Drawers
-        // ---------------------------------------------------------------------
-        var dependencies_met_mmenu_initialized = setInterval (function () {
-          if (ssm_html_loaded && $('#{{ssm_options.menu_id}}').length) {
-            _this.setState('loaded');
-            logger.info('set module state to: ' + _this.getState());
-            logger.info('HTML data for ssm: ' + _this.getState());
-            if(isToc) {
-              logger.info('found toc in page: enabled');
-              if ( j1.adapter.toccer.getState() == 'finished' ) {
-                logger.info('dependency met for module : toccer');
-                _this.setState('processing');
-                logger.info('set module state to: ' + _this.getState());
-                logger.info('initialize ssm menu');
-                (ssmOptions.mode === 'icon')
-                  ? logger.info('ssm mode detected: icon')
-                  : logger.info('ssm mode detected: menu');
-                _this.scrollSpy(ssmOptions);
-                _this.buttonInitializer(ssmOptions);
-                clearInterval(dependencies_met_mmenu_initialized);
-              }
-            } else {
-              logger.info('found toc in page: disabled');
-              logger.info('disable toc menu and prev|next section buttons');
-              $('#ssm_toc').closest('.ssm-btn').hide();
-              $('#ssm_previous_section').closest('.ssm-btn').hide();
-              $('#ssm_next_section').closest('.ssm-btn').hide();
+      j1.xhrData ({
+        xhr_container_id: '{{ssm_options.xhr_container_id}}',
+        xhr_data_path:    '{{ssm_options.xhr_data_path}}' },
+        'j1.adapter.ssm',
+        'data_loaded');
+
+      // ---------------------------------------------------------------------
+      // Initialize MMenu Navs and Drawers
+      // ---------------------------------------------------------------------
+      var dependencies_met_mmenu_initialized = setInterval (function () {
+        if (j1.xhrDOMState['#{{ssm_options.xhr_container_id}}'] == 'success') {
+          _this.setState('loaded');
+          logger.info('set module state to: ' + _this.getState());
+          logger.info('HTML data for ssm: ' + _this.getState());
+          j1.core.ssm.init (moduleOptions);
+          if(isToc) {
+            logger.info('found toc in page: enabled');
+            if ( j1.adapter.toccer.getState() == 'finished' ) {
+              logger.info('dependency met for module : toccer');
+              _this.setState('processing');
+              logger.info('set module state to: ' + _this.getState());
+              logger.info('initialize ssm menu');
+              (ssmOptions.mode === 'icon')
+                ? logger.info('ssm mode detected: icon')
+                : logger.info('ssm mode detected: menu');
               _this.scrollSpy(ssmOptions);
               _this.buttonInitializer(ssmOptions);
+
+              _this.setState('finished');
+              logger.info('state: ' + _this.getState());
+              logger.info('module initialized successfully');
               clearInterval(dependencies_met_mmenu_initialized);
             }
+          } else {
+            logger.info('found toc in page: disabled');
+            logger.info('disable toc menu and prev|next section buttons');
+            $('#ssm_toc').closest('.ssm-btn').hide();
+            $('#ssm_previous_section').closest('.ssm-btn').hide();
+            $('#ssm_next_section').closest('.ssm-btn').hide();
+            _this.scrollSpy(ssmOptions);
+            _this.buttonInitializer(ssmOptions);
+            clearInterval(dependencies_met_mmenu_initialized);
           }
-        }, 25); // END dependencies_met_mmenu_loaded
-      }); // END done
+        }
+      }, 25); // END dependencies_met_mmenu_initialized
     }, // END dataLoader
 
     // -------------------------------------------------------------------------
@@ -275,7 +275,7 @@ j1.adapter['ssm'] = (function (j1, window) {
           $('#{{button_id}}').each(function(e) {
             var $this = $(this);
             $this.on('click', function(e) {
-              j1.adapter.ssm.{{item.event_handler}}(sect1Nodes);
+              _this.{{item.event_handler}}(sect1Nodes);
             });
           });
         } else {
@@ -460,22 +460,6 @@ j1.adapter['ssm'] = (function (j1, window) {
       return true;
     }, // END messageHandler
 
-    // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
-    // -------------------------------------------------------------------------
-    setState: function (stat) {
-      j1.adapter.ssm.state = stat;
-    }, // END setState
-
-    // -------------------------------------------------------------------------
-    // getState
-    // Returns the current (processing) state of the module
-    // -------------------------------------------------------------------------
-    getState: function () {
-      return j1.adapter.ssm.state;
-    }, // END state
-
     // -------------------------------------------------------------------------
     // Manage (top) position and sizes (@media breakpoints) of the
     // SSM container depending on the size of the page header (attic)
@@ -525,11 +509,27 @@ j1.adapter['ssm'] = (function (j1, window) {
           ? $ssmContainer.css('display','block')
           : $ssmContainer.css('display','none');
 
-        logger.debug('content pos detected as: ' + m + 'px');
-        logger.debug('scroll pos detected as: ' + scrollPos + 'px');
+        // logger.debug('content pos detected as: ' + m + 'px');
+        // logger.debug('scroll pos detected as: ' + scrollPos + 'px');
       }); // END setTop on scroll
 
-    } // END scrollSpy
+    }, // END scrollSpy
+
+    // -------------------------------------------------------------------------
+    // 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);

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

@@ -19,7 +19,7 @@ regenerate: true
  #
  # -----------------------------------------------------------------------------
  # Test data:
- #  {{ config | debug }}
+ #  {{config| debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -48,7 +48,7 @@ regenerate: true
 
 {% 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" %}
@@ -98,20 +98,19 @@ regenerate: true
 '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;
@@ -134,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) {
@@ -147,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
@@ -176,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
@@ -216,7 +211,11 @@ j1.adapter['themer'] = (function (j1, window) {
         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
@@ -230,50 +229,52 @@ j1.adapter['themer'] = (function (j1, window) {
         logger.info('themes detected as: enabled');
         logger.info('theme is being initialized: ' + themeName);
 
-      /* eslint-disable */
-      $.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 }}
-        })
-      /* eslint-enable */
-      .done (function(ThemeList) {
-        if (themeName === 'Uno' || themeName === 'Bootstrap') {
-          theme = environment === 'production'
-            ? themeName.toLowerCase() + '.min.css'
-            : themeName.toLowerCase() + '.css';
-        } else {
-          theme = 'bootstrap.css';  // fallback
+      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';
+          } else {
+            theme = 'bootstrap.css';  // fallback
+          }
+          logger.info('theme loaded: ' + themeName);
+          logger.info('theme file: ' + theme);
+
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
+          clearInterval(dependencies_met_navigator_started);
         }
-        logger.info('theme loaded: ' + themeName);
-        logger.info('theme file: ' + theme);
-        _this.setState('finished');
-        logger.info('state: ' + _this.getState());
-        logger.info('module initialized successfully');
-
-      });
+      }, 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
 
     // -------------------------------------------------------------------------
@@ -282,8 +283,6 @@ j1.adapter['themer'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     setCss: function () {
       var bg_primary                      = j1.getStyleValue('bg-primary', 'background-color');
-
-      return true;
     }, // END setCss
 
     // -------------------------------------------------------------------------
@@ -300,41 +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 %}
 {% if production %}
-  {{ cache | minifyJS }}
+  {{cache| minifyJS }}
 {% else %}
-  {{ cache | strip_empty_lines }}
+  {{cache| strip_empty_lines }}
 {% endif %}
 {% assign cache = nil %}