j1_template 2019.4.8 → 2019.4.10

data/lib/starter_web/assets/themes/j1/adapter/js/framer.js

@@ -79,7 +79,6 @@ j1.adapter['framer'] = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var state         = 'not started';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -98,6 +97,8 @@ j1.adapter['framer'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function ( options ) {
+      // initialize state flag
+      j1.adapter.framer.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -112,19 +113,19 @@ j1.adapter['framer'] = (function (j1, window) {
       // Load  module DEFAULTS|CONFIG
       //
       moduleOptions = $.extend({}, {{framer_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      
-      if ( typeof settings !== 'undefined') { 
+
+      if ( typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData( moduleOptions, settings );
-      } 
+      }
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.framer;   
+      _this   = j1.adapter.framer;
       logger  = log4javascript.getLogger('j1.adapter.framer');
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       iFrameResize({
         log:                      moduleOptions.settings.log,
@@ -155,9 +156,9 @@ j1.adapter['framer'] = (function (j1, window) {
     // 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);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -165,7 +166,9 @@ j1.adapter['framer'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -177,17 +180,19 @@ j1.adapter['framer'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.scroller.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.scroller.state;
     } // END state
 
   }; // END return
@@ -196,4 +201,4 @@ j1.adapter['framer'] = (function (j1, window) {
 {% endcapture %}
 
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/lib/starter_web/assets/themes/j1/adapter/js/justified_gallery.js

@@ -74,7 +74,6 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var state         = 'unknown';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -93,6 +92,9 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function ( options ) {
+      // initialize state flag
+      j1.adapter.jf_gallery.state = 'pending';
+
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -107,19 +109,19 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       // Load  module DEFAULTS|CONFIG
       //
       moduleOptions = $.extend({}, {{jf_gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      
-      if ( typeof settings !== 'undefined') { 
+
+      if ( typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData( moduleOptions, settings );
-      }  
+      }
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this = j1.adapter.jf_gallery;
       logger = log4javascript.getLogger('j1.adapter.jf_gallery');
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       _this.load( moduleOptions );
 
@@ -133,8 +135,8 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       logger = log4javascript.getLogger('j1.adapter.jf_gallery.load');
 
       {% if environment == 'development' %}
-        state = 'running';
-        logger.info('state: ' + state); // Set|Log status
+        _this.setState('running');
+        logger.info('state: ' + _this.getState());
       {% endif %}
 
       {% for item in jf_gallery_options.galleries %}
@@ -297,9 +299,9 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     // 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);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -319,21 +321,23 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.jf_gallery.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.jf_gallery.state;
     } // END state
 
   }; // END return
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{{ cache | strip_empty_lines }}

data/lib/starter_web/assets/themes/j1/adapter/js/lightbox.js

@@ -78,7 +78,6 @@ j1.adapter['lightbox'] = (function (j1, window) {
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var state         = 'unknown';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -97,15 +96,17 @@ j1.adapter['lightbox'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function () {
+      // initialize state flag
+      j1.adapter.lightbox.state = 'pending';      
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.lightbox;  
+      _this   = j1.adapter.lightbox;
       logger  = log4javascript.getLogger('j1.adapter.lightbox');
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       lightbox.option({
         alwaysShowNavOnTouchDevices:  {{ lightbox_options.alwaysShowNavOnTouchDevices | json }},
@@ -122,9 +123,9 @@ j1.adapter['lightbox'] = (function (j1, window) {
         wrapAround:                   {{ lightbox_options.wrapAround | json }}
       });
 
-      state = 'finished';
-      logger.info('state: ' + state);
-      logger.info('Module initialized successfully');
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initializing finished');
 
       return true;
     }, // END init lightbox
@@ -133,9 +134,9 @@ j1.adapter['lightbox'] = (function (j1, window) {
     // 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);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -143,7 +144,9 @@ j1.adapter['lightbox'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -155,17 +158,19 @@ j1.adapter['lightbox'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.lightbox.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.lightbox.state;
     } // END state
 
   }; // END return
@@ -174,4 +179,4 @@ j1.adapter['lightbox'] = (function (j1, window) {
 {% endcapture %}
 
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/lib/starter_web/assets/themes/j1/adapter/js/logger.js

@@ -73,7 +73,6 @@ j1.adapter['logger'] = (function (j1, window) {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}';
-  var state         = 'not_started';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -135,15 +134,16 @@ j1.adapter['logger'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function () {
+      // initialize state flag
+      j1.adapter.logger.state = 'pending';
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.logger;  
+      _this   = j1.adapter.logger;
       logger  = log4javascript.getLogger('j1.adapter.logger');
 
-      logger.info('Logger Framework is being initialized');
-      state = 'started';
-      logger.info('state: ' + state);
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
 
       // Create a console consoleAppender inherited by all (client) loggers
       var consoleAppender = new log4javascript.BrowserConsoleAppender();
@@ -172,9 +172,8 @@ j1.adapter['logger'] = (function (j1, window) {
         log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
       }
 
-      state = 'finished';
-      logger.info('state: ' + state);
-      logger.info('Module initialized successfully');
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
 
       return true;
     }, // END init
@@ -183,9 +182,9 @@ j1.adapter['logger'] = (function (j1, window) {
     // messageHandler: MessageHandler for J1 NAV module
     // Manage messages (paylods) send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -193,7 +192,9 @@ j1.adapter['logger'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -205,17 +206,19 @@ j1.adapter['logger'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.logger.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.logger.state;
     } // END state
 
   }; // END return
@@ -224,4 +227,4 @@ j1.adapter['logger'] = (function (j1, window) {
 {% endcapture %}
 
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

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

@@ -100,31 +100,35 @@ ToDo: Remove configuration from j1_navigator.yml
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/assets/themes/j1/adapter/js/navigator.js
- #  JS Adapter for J1 Navigator
- #
- #  Product/Info:
- #  {{site.data.template_settings.theme_author_url}}
+ # ~/assets/themes/j1/adapter/js/navigator.js
+ # JS Adapter for J1 Navigator
  #
- #  Copyright (C) 2019 Juergen Adams
+ # Product/Info:
+ # {{site.data.template_settings.theme_author_url}}
  #
- #  J1 Template is licensed under the MIT License.
- #  For details, see {{site.data.template_settings.theme_author_url}}
+ # Copyright (C) 2019 Juergen Adams
  #
+ # J1 Template is licensed under the MIT License.
+ # For details, see {{site.data.template_settings.theme_author_url}}
+ # -----------------------------------------------------------------------------
+ # NOTE: For AJAX (XHR) loads see
+ #  https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
  # -----------------------------------------------------------------------------
- #  Adapter generated: {{site.time}}
+ # NOTE: For getStyleValue helper see
+ #  https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
+ # -----------------------------------------------------------------------------
+ # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 'use strict';
 
-{% comment %} Main
--------------------------------------------------------------------------------- {% endcomment %}
 j1.adapter['navigator'] = (function (j1, window) {
 
-  {% comment %} Set global variables
-  ------------------------------------------------------------------------------ {% endcomment %}
-  var environment                 = '{{environment}}'; 
-  var state                       = 'not_started';
+  // ---------------------------------------------------------------------------
+  // globals
+  // ---------------------------------------------------------------------------
+  var environment                 = '{{environment}}';
+  var dclFinished                 = false;
   var moduleOptions               = {};
 
   var nav_menu_id                 = '{{nav_menu_id}}';
@@ -158,308 +162,207 @@ j1.adapter['navigator'] = (function (j1, window) {
 
 
   // ---------------------------------------------------------------------------
-  // Main object
+  // helper functions
+  // ---------------------------------------------------------------------------
+
+
+  // ---------------------------------------------------------------------------
+  // main object
   // ---------------------------------------------------------------------------
   return {
 
     // -------------------------------------------------------------------------
-    // Initializer
+    // module initializer
     // -------------------------------------------------------------------------
-    init: function ( options ) {    
-
-      {% comment %} Initialize configuration setting objects
-      -------------------------------------------------------------------------- {% endcomment %}
-      var authConfig              = {};
-
-      // Module setting objects
-      var navDefaults             = {};
-      var navBarConfig            = {};
-      var navMenuConfig           = {};
-      var navQuicklinksConfig     = {};
-      var navTopsearchConfig      = {};
-      var navSidebarConfig        = {};
-      var navAuthClientConfig     = {};
-      var navBarOptions           = {};
-      var navMenuOptions          = {};
-      var navQuicklinksOptions    = {};
-      var navTopsearchOptions     = {};
-      var navSidebarOptions       = {};
-      var navAuthClientOptions    = {};
-
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.navigator;
-      logger  = log4javascript.getLogger('j1.adapter.navigator');
+    init: function (options) {
+      // initialize state flag
+      j1.adapter.navigator.state = 'pending';
 
-      logger.info('Mode detected as: ' + j1.getMode());
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      // -----------------------------------------------------------------------
+      // defaults
+      // -----------------------------------------------------------------------
+      var settings  = $.extend({
+        module_name: 'j1.adapter.navigator',
+        generated:   '{{site.time}}'
+      }, options );
+      _this         = j1.adapter.navigator;
+      logger        = log4javascript.getLogger('j1.adapter.navigator');
 
-      {% comment %} Load module config from yml data file
-      -------------------------------------------------------------------------- {% endcomment %}
-      // Load module DEFAULTS|CONFIG
-      //
-      navDefaults                 = $.extend({}, {{navigator_defaults | replace: '=>', ':' }});
-      navBarConfig                = $.extend({}, {{nav_bar_options | replace: '=>', ':' }});
-      navMenuConfig               = $.extend({}, {{nav_menu_options | replace: '=>', ':' }});
-      navQuicklinksConfig         = $.extend({}, {{quicklinks_options | replace: '=>', ':' }});
-      navTopsearchConfig          = $.extend({}, {{topsearch_options | replace: '=>', ':' }});
-      navSidebarConfig            = $.extend({}, {{sidebar_options | replace: '=>', ':' }});
-      navAuthClientConfig         = $.extend({}, {{authclient_options | replace: '=>', ':' }});
+      // -----------------------------------------------------------------------
+      // options loader
+      // -----------------------------------------------------------------------
+      var authConfig                                = {};
+      var navDefaults                               = {};
+      var navBarConfig                              = {};
+      var navMenuConfig                             = {};
+      var navQuicklinksConfig                       = {};
+      var navTopsearchConfig                        = {};
+      var navSidebarConfig                          = {};
+      var navAuthClientConfig                       = {};
+      var navBarOptions                             = {};
+      var navMenuOptions                            = {};
+      var navQuicklinksOptions                      = {};
+      var navTopsearchOptions                       = {};
+      var navSidebarOptions                         = {};
+      var navAuthClientOptions                      = {};
+      var navAuthMAnagerConfig                      = {};
+
+      navDefaults                                   = $.extend({}, {{navigator_defaults | replace: '=>', ':' }});
+      navBarConfig                                  = $.extend({}, {{nav_bar_options | replace: '=>', ':' }});
+      navMenuConfig                                 = $.extend({}, {{nav_menu_options | replace: '=>', ':' }});
+      navQuicklinksConfig                           = $.extend({}, {{quicklinks_options | replace: '=>', ':' }});
+      navTopsearchConfig                            = $.extend({}, {{topsearch_options | replace: '=>', ':' }});
+      navSidebarConfig                              = $.extend({}, {{sidebar_options | replace: '=>', ':' }});
+      navAuthClientConfig                           = $.extend({}, {{authclient_options | replace: '=>', ':' }});
+
+      navAuthMAnagerConfig                          = $.extend({}, {{auth_manager_config | replace: '=>', ':' }});
+      authClientEnabled                             = navAuthMAnagerConfig.enabled;
 
-      authConfig                  = $.extend({}, {{auth_manager_config | replace: '=>', ':' }});
-      authClientEnabled           = authConfig.enabled;
 
       // Merge|Overload module CONFIG by DEFAULTS
       //
-      navBarOptions               = j1.mergeData(navBarConfig, navDefaults.nav_bar);
-      navMenuOptions              = j1.mergeData(navMenuConfig, navDefaults.nav_menu);
-      navQuicklinksOptions        = j1.mergeData(navQuicklinksConfig, navDefaults.nav_quicklinks);
-      navTopsearchOptions         = j1.mergeData(navTopsearchConfig, navDefaults.nav_topsearch);
-      navSidebarOptions           = j1.mergeData(navSidebarConfig, navDefaults.nav_sidebar);
-      navAuthClientConfig         = j1.mergeData(navAuthClientConfig, navDefaults.nav_authclient);
-
+      navBarOptions                                 = j1.mergeData(navBarConfig, navDefaults.nav_bar);
+      navMenuOptions                                = j1.mergeData(navMenuConfig, navDefaults.nav_menu);
+      navQuicklinksOptions                          = j1.mergeData(navQuicklinksConfig, navDefaults.nav_quicklinks);
+      navTopsearchOptions                           = j1.mergeData(navTopsearchConfig, navDefaults.nav_topsearch);
+      navSidebarOptions                             = j1.mergeData(navSidebarConfig, navDefaults.nav_sidebar);
+      navAuthClientConfig                           = j1.mergeData(navAuthClientConfig, navDefaults.nav_authclient);
+
+      // save config settings into the navigator object for global access
+      //
+      j1.adapter.navigator['navDefaults']           = navDefaults;
       j1.adapter.navigator['navBarOptions']         = navBarOptions;
       j1.adapter.navigator['navMenuOptions']        = navMenuOptions;
       j1.adapter.navigator['navQuicklinksOptions']  = navQuicklinksOptions;
       j1.adapter.navigator['navTopsearchOptions']   = navTopsearchOptions;
       j1.adapter.navigator['navSidebarOptions']     = navSidebarOptions;
       j1.adapter.navigator['navAuthClientConfig']   = navAuthClientConfig;
+      j1.adapter.navigator['navAuthManagerConfig']  = navAuthMAnagerConfig;
 
       // Load (individual) frontmatter options (currently NOT used)
       if ( options  != null ) { var frontmatterOptions = $.extend({}, options) }
-  
-      {% comment %} Load (HTML) data asychronously
-      See: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
-      -------------------------------------------------------------------------- {% endcomment %}
-      logger.info('run deferred (AJAX) data load');
-      $.when( 
-        j1.xhrLoadData('j1.adapter.navigator', navSidebarOptions, 'sideBarLoaded'),
-        j1.xhrLoadData('j1.adapter.navigator', navQuicklinksOptions, 'quickLinksLoaded'),
-        _this.loadMenuBar(navDefaults, navMenuOptions))
-      .done (function( sideBar, quickLinks, menuBar ) {
-        logger.info('deferred (AJAX) data load finished');
-        logger.info('initialite navigator core');
-
-
-        {% comment %} Set CSS styles if j1.template.init() loaded all data objects
-        ------------------------------------------------------------------------ {% endcomment %}
-        var dataLoaded = setInterval(function() {
-          if (typeof j1.colors !== 'undefined' && typeof j1.fonts !== 'undefined') {
-            // clear interval checking
-            clearInterval(dataLoaded);
-            logger.info('apply CSS styles');
-            _this.setCss( navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions );
-          }
-        }, 25); // END 'dataLoaded'
-
-        // Detect|Set J1 App status
-        appDetected       = j1.appDetected();
-        authClientEnabled = j1.authClientEnabled();
-        logger.info('application status detected: ' + appDetected);
 
-        // Load AuthClient modals if appDetected
-        if ( appDetected ) {
-          logger.info('load AuthClient modals');
-          j1.adapter.navigator.loadAuthClientModals( authConfig );
-        }
-
-      });
+      logger.info('mode detected as: ' + j1.getMode());
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       // -----------------------------------------------------------------------
-      // Reset on resize (should moved to core)
+      // data loader
       // -----------------------------------------------------------------------
-      $(window).on("resize", function() {
-      
-        j1.core.navigator.manageDropdownMenu( navDefaults, navMenuOptions );
-        $(".top-search").slideUp();
-        setTimeout(function(){
-          j1.core.navigator.navbarSticky();
-        }, 500);
-      
-        // Toggle Bars
-        $('button.navigator.navbar-toggler').each( function() {
-          $(".mdi", this).removeClass("mdi-close");
-          $(".mdi", this).addClass("mdi-menu");
-          $(this).removeClass("fixed");
-        });
-        $(".navbar-collapse").removeClass("in");
-        $(".navbar-collapse").removeClass("on");
-        $(".navbar-collapse").removeClass("bounceIn");
-      });
-
-      return true;
-    }, // END init
-
-    // -------------------------------------------------------------------------
-    // load the Menu bar
-    // -------------------------------------------------------------------------
-    loadMenuBar: function ( defaultOptions, menuOptions ) {
-      var navDefaultOptions = defaultOptions;
-      var navMenuOptions    = menuOptions;
-
-      var logger  = log4javascript.getLogger('j1.adapter.navigator.loadMenuBar');
-      var logText = 'Load SideBar';
-      logger.info(logText);
-
-      // closure to pass additional data (e.g. div #id)
-      // to AJAX load callback (id)
-      // See: http://stackoverflow.com/questions/939032/jquery-pass-more-parameters-into-callback
-      var cb_load_closure = function(id, navMenuOptions) {
-        return function ( responseTxt, statusTxt, xhr ) {
-          if ( statusTxt == "success" ) {            
-            var logText = "MenuBar on ID " +id+ " loaded successfully"
-            j1.core.navigator.init( navDefaultOptions, navMenuOptions );
-            logger.info(logText);
-            // Set processing to 'finished' to display page
-            state = 'finished';
-            logger.info('state: ' + state); // Set|Log status
-
-            // Initialize theme selectors for J1Theme Switcher
-            $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''});            // Load from Bootswatch API
-            $('#ThemeSelect').bootstrapThemeSwitcher();                         // Load from localFeed
-            var logText = "ThemeSwitcher Feeds on ID " +id+ " loaded successfully"
-            logger.info(logText);
-          }
-          if ( statusTxt == "error" ) {
-            state = 'failed';
-            logger.error('state: ' + state);
-            var logText = "MenuBar on ID " +id+ " loading failed. Error: " + xhr.status + ": " + xhr.statusText;
-            logger.error(logText);
-          }
-        };
-      };
-
-      var id = "#" + menuOptions.xhr_container_id;
-      var selector = $(id);
-
-      if ( selector.length ) {
-        var menu_data_path = menuOptions.xhr_data_path + " > *";
-        selector.load( menu_data_path, cb_load_closure( id, navMenuOptions ) );
-      }
-
-      return true;
-    }, // END loadMenuBar
-
-    // -------------------------------------------------------------------------
-    // load the Sidebar
-    // -------------------------------------------------------------------------
-    loadSideBar: function ( options ) {
-      var loadSideBarOptions = options;
-
-      var logger  = log4javascript.getLogger('j1.adapter.navigator.loadSideBar');
-      var logText = 'Load SideBar';
-      logger.info(logText);
-
-      var cb_load_closure = function( id ) {
-        return function ( responseTxt, statusTxt, xhr ) {
-          if ( statusTxt == "success" ) {
-            var logText = "Sidebar on ID " +id+ " loaded successfully"
-            logger.info(logText);
-            // Set processing to 'finished' to display page
-            // state = 'sidebar_loaded';
-            // logger.info('state: ' + state); // Set|Log status
-          }
-          if ( statusTxt == "error" ) {
-            state = 'failed';
-            logger.error('state: ' + state);
-            var logText = "Loading Sidebar on ID " +id+ " failed. Error: " + xhr.status + ": " + xhr.statusText;
-            logger.error(logText);
-          }
-        };
-      };
-
-      var id = "#" + nav_sidebar_id;
-      var selector = $(id);
-
-      if ( selector.length ) {
-        var sidebar_data_path = nav_sidebar_data_path;
-        selector.load( sidebar_data_path, cb_load_closure( id ) );
-      }
-
-      return true;
-    }, // END loadSideBar
-
-    // -------------------------------------------------------------------------
-    // load the QuickLinks bar
-    // -------------------------------------------------------------------------
-    loadQuickLinks: function ( options ) {
-      var quickLinkOptions = options;
-
-      var logger  = log4javascript.getLogger('j1.adapter.navigator.loadQuickLinks');
-      var logText = 'Load  QuickLinks';
-      logger.info(logText);
-
-      // closure to pass additional data (e.g. div #id)
-      var cb_load_closure = function( id ) {
-        return function ( responseTxt, statusTxt, xhr ) {
-          if ( statusTxt == "success" ) {
-            var logText = "QuickLinks on ID " +id+ " loaded successfully"
-            logger.info(logText);
-            // Set processing to 'finished' to display page
-            // state = 'quicklinks_loaded';
-            // logger.info('state: ' + state); // Set|Log status
-          }
-          if ( statusTxt == "error" ) {
-            state = 'failed';
-            logger.error('state: ' + state);
-            var logText = "Loading QuickLinks on ID " +id+ " failed. Error: " + xhr.status + ": " + xhr.statusText;
-            logger.error(logText);
+      logger.info('run deferred data load)');
+      $.when (
+        j1.xhrDATA ( // sidebar
+          'j1.adapter.navigator', {
+          xhr_container_id: navSidebarOptions.xhr_container_id,
+          xhr_data_path:    navSidebarOptions.xhr_data_path },
+          null),
+        j1.xhrDATA ( // quicklinks
+          'j1.adapter.navigator', {
+          xhr_container_id: navQuicklinksOptions.xhr_container_id,
+          xhr_data_path:    navQuicklinksOptions.xhr_data_path },
+          null),
+        j1.xhrDATA ( // authclient
+          'j1.adapter.navigator', {
+          xhr_container_id: navAuthClientConfig.xhr_container_id,
+          xhr_data_path:    navAuthClientConfig.xhr_data_path },
+          null),
+        j1.xhrDATA ( // menubar
+          'j1.adapter.navigator', {
+          xhr_container_id: navMenuOptions.xhr_container_id,
+          xhr_data_path:    navMenuOptions.xhr_data_path },
+          'data_loaded'))
+      .done (function (sideBar, quickLinks, authclient, menuBar) {
+        // ---------------------------------------------------------------------
+        // core initializer
+        // ---------------------------------------------------------------------
+        var dependencies_met_navigator_core = setInterval (function () {
+          if ( _this.getState() === 'data_loaded') {
+            _this.setState('processing');
+
+            logger.info('status: ' + _this.getState());
+            logger.info('initialize navigator core');
+
+            // Detect|Set J1 App status
+            appDetected       = j1.appDetected();
+            authClientEnabled = j1.authClientEnabled();
+            logger.info('application status detected: ' + appDetected);
+
+            var dependencies_met_nav_menu = setInterval (function() {
+              if (typeof j1.colors !== 'undefined') {
+                j1.core.navigator.init (
+                  _this.navDefaults,
+                  _this.navMenuOptions
+                );
+
+                // initialize theme switcher menu
+                $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''});        // load themes from Bootswatch API
+                $('#ThemeSelect').bootstrapThemeSwitcher();                     // Load (local) J1 themes
+                logText = 'theme switcher menu loaded successfully';
+                logger.info(logText);
+                _this.setState('initialized');
+                clearInterval(dependencies_met_nav_menu);
+              }
+            }, 25); // END 'core initialized'
+
+            // -----------------------------------------------------------------
+            // event handler + css styles
+            // NOTE: jadams, 2019-08-22:
+            //  Add to dependcy to themer to fix
+            //  missing color setting for menu bar background
+            // -----------------------------------------------------------------
+            var dependencies_met_events_css = setInterval(function() {
+              if (_this.getState() === 'initialized' && j1.adapter.themer.getState() === 'finished') {
+                _this.setState('processing');
+
+                logger.info('initialize events and styles');
+                j1.core.navigator.eventHandler();
+
+                // set general|global module colors
+                logger.info('apply styles');
+                _this.setCSS (
+                  navBarOptions, navMenuOptions,
+                  navQuicklinksOptions, navTopsearchOptions,
+                  navSidebarOptions
+                );
+
+                logger.info('init AuthClient');
+                j1.adapter.navigator.initAuthClient(j1.adapter.navigator.navAuthManagerConfig);
+                _this.setState('finished');
+                logger.info('state: ' + _this.getState());
+                clearInterval(dependencies_met_events_css);
+              }
+            }, 25); // END 'core initialized'
+            clearInterval(dependencies_met_navigator_core);
           }
-        };
-      };
-
-      var id = "#" + nav_quicklinks_id;
-      var selector = $(id);
-
-      if ( selector.length ) {
-        var quicklinks_data_path = nav_quicklinks_data_path;
-        selector.load( quicklinks_data_path, cb_load_closure( id ) );
-      }
-
-      return true;
-    }, // END loadQuickLinks
+        }, 25); // END 'dependencies_met_navigator_core'
+
+        // -----------------------------------------------------------------------
+        // Register event 'reset on resize' (should moved to core events)
+        // -----------------------------------------------------------------------
+        $(window).on('resize', function() {
+          j1.core.navigator.manageDropdownMenu(navDefaults, navMenuOptions);
+
+          $('.top-search').slideUp();
+          setTimeout (function(){
+            j1.core.navigator.navbarSticky();
+          }, 500);
+
+          // Toggle Bars
+          $('button.navigator.navbar-toggler').each (function() {
+            $('.mdi', this).removeClass('mdi-close');
+            $('.mdi', this).addClass('mdi-menu');
+            $(this).removeClass('fixed');
+          });
 
-    // -------------------------------------------------------------------------
-    // load the modals used by J1AuthClient
-    // -------------------------------------------------------------------------
-    loadAuthClientModals: function ( authConfig ) {
-
-      var cb_load_closure = function( id ) {
-        return function ( responseTxt, statusTxt, xhr ) {
-          if ( statusTxt == "success" ) {
-            var logText = "Modals on ID " +id+ " loaded successfully"
-            j1.adapter.navigator.initAuthClient( authConfig );
-            logger.info(logText);
-            state = 'finished';
-            logger.info('state: ' + state);
-          }
-          if ( statusTxt == "error" ) {
-            state = 'failed';
-            logger.error('state: ' + state);
-            var logText = "Modals on ID " +id+ " loading failed. Error: " + xhr.status + ": " + xhr.statusText;
-            logger.error(logText);
-          }
-        };
-      };
-
-      var id = "#" + authclient_modals_id;
-      var selector = $(id);
-
-      if ( selector.length ) {
-        var modals_data_path = authclient_modals_data_path + " > *";
-        selector.load( modals_data_path, cb_load_closure( id ) );
-      } else {
-        var logText = "AuthClient Modals not loaded"
-        logger.info(logText);
-        // Set processing to 'finished' to display page
-        state = 'finished';
-        logger.info('state: ' + state);
-      }
+          $('.navbar-collapse').removeClass('in');
+          $('.navbar-collapse').removeClass('on');
+          $('.navbar-collapse').removeClass('bounceIn');
+        });
 
-      return true;
-    }, // END loadAuthClientModals
+        return true;
+      }); // END 'core initializer'
+    }, // END init
 
     // -------------------------------------------------------------------------
     // Initialize JS portion for the dialogs (modals) used by J1AuthClient
@@ -467,48 +370,37 @@ j1.adapter['navigator'] = (function (j1, window) {
     //       All updates on Cookies are managed by Cookie Consent.
     //       To be considered to re-add cookie updates for the auth state
     // -------------------------------------------------------------------------
-    initAuthClient: function( auth_config ) {
-      var user_state;
-
-      user_state  = j1.readCookie(cookie_user_session_name);
-
-      logger      = log4javascript.getLogger('j1.adapter.navigator.initAuthClient');
-      state       = 'initialize';
-      logText     = 'state: ' + state;
-      logger.info(logText);
+    initAuthClient: function(auth_config) {
+      var logger      = log4javascript.getLogger('j1.adapter.navigator.initAuthClient');
+      var user_state  = j1.readCookie(cookie_user_session_name);
 
-      _this.modalEventHandler( auth_config );
+      _this.modalEventHandler(auth_config);
 
-      if ( j1.appDetected() && j1.authClientEnabled() ) {
+      if (j1.appDetected() && j1.authClientEnabled()) {
         // Toggle/Set SignIn/SignOut icon|link in QuickLinks
         // See: https://stackoverflow.com/questions/13524107/how-to-set-data-attributes-in-html-elements
-        if ( user_state.authenticated === 'true' ) {
+        if (user_state.authenticated === 'true') {
           // Set SignOut
-          $('#navLinkSignInOut').attr("data-target","#modalOmniSignOut");
-          $('#iconSignInOut').removeClass( "mdi-login" ).addClass( "mdi-logout" );
+          $('#navLinkSignInOut').attr('data-target', '#modalOmniSignOut');
+          $('#iconSignInOut').removeClass('mdi-login').addClass('mdi-logout');
         } else {
           // Set SignIn
-          $('#navLinkSignInOut').attr("data-target","#modalOmniSignIn");
-          $('#iconSignInOut').removeClass( "mdi-logout" ).addClass( "mdi-login" );
+          $('#navLinkSignInOut').attr('data-target', '#modalOmniSignIn');
+          $('#iconSignInOut').removeClass('mdi-logout').addClass('mdi-login');
         }
       }
 
-      // Set|Log status
-      state = 'initialized';
-      logText = 'state: ' + state;
-      logger.info(logText);
-
       return true;
     }, // END initAuthClient
 
     // -------------------------------------------------------------------------
-    // EventHandler for J1 AuthClient
+    // modalEventHandler
     // Manage button click events for all BS Modals
     // See: https://www.nickang.com/add-event-listener-for-loop-problem-in-javascript/
     // -------------------------------------------------------------------------
-    modalEventHandler: function ( options ) {
-
-      var authConfig = options;
+    modalEventHandler: function (options) {
+      var logger      = log4javascript.getLogger("j1.adapter.navigator.EventHandler");
+      var authConfig  = options;
       var route;
       var provider;
       var provider_url;
@@ -527,125 +419,114 @@ j1.adapter['navigator'] = (function (j1, window) {
         do:               false
       }
 
-      var logger = log4javascript.getLogger("j1.adapter.navigator.EventHandler"); // Setup logger
-
       logText = "Initialize button click events";
       logger.info(logText);
 
-      // var modalsLoaded = setInterval(function() {
-      //   if ( j1.adapter.navigator.getState() === 'finished' ) {
-
-          // Manage button click events for modal "signInOutButton"
-          // -------------------------------------------------------------------
-          $('ul.nav-pills > li').click(function (e) {
-            e.preventDefault();
-            // jadams, 2019-07-30: To be checked if needed
-            signIn.provider       = $(this).text().trim();
-            signIn.provider       = signIn.provider.toLowerCase();
-            signIn.allowed_users  = signIn.users.toString();
-          });
+      // Manage button click events for modal "signInOutButton"
+      // -------------------------------------------------------------------
+      $('ul.nav-pills > li').click(function (e) {
+        e.preventDefault();
+        // jadams, 2019-07-30: To be checked if needed
+        signIn.provider       = $(this).text().trim();
+        signIn.provider       = signIn.provider.toLowerCase();
+        signIn.allowed_users  = signIn.users.toString();
+      });
 
-          $("a.btn").click(function() {
-            if (this.id === "signInButton") {
-              signIn.do = true;
-            } else {
-              signIn.do = false;
-            }
-            if (this.id === "signOutButton") {
-              signOut.do = true;
-            } else {
-              signOut.do = false;
-            }
-          });
+      $("a.btn").click(function() {
+        if (this.id === "signInButton") {
+          signIn.do = true;
+        } else {
+          signIn.do = false;
+        }
+        if (this.id === "signOutButton") {
+          signOut.do = true;
+        } else {
+          signOut.do = false;
+        }
+      });
 
-          $('input:checkbox[name="providerSignOut"]').on('click', function (e) {
-            e.stopPropagation();
-            signOut.providerSignOut = $('input:checkbox[name="providerSignOut"]').is(":checked");
-            if( environment == "development" ) {
-              logText = "Provider signout set to: " + signOut.providerSignOut;
-              logger.info( logText );
-            }
-          });
+      $('input:checkbox[name="providerSignOut"]').on('click', function (e) {
+        e.stopPropagation();
+        signOut.providerSignOut = $('input:checkbox[name="providerSignOut"]').is(":checked");
+        if( environment == "development" ) {
+          logText = "Provider signout set to: " + signOut.providerSignOut;
+          logger.info( logText );
+        }
+      });
 
-          // Manage pre events on modal "modalOmniSignIn"
-          // -------------------------------------------------------------------
-          $("#modalOmniSignOut").on('show.bs.modal', function() {
-              var modal = $(this);
-              logger.info('Place current user data');
-              user_state = j1.readCookie(cookie_user_session_name);
-              modal.find('.user-info').text('You are signed in to provider: ' + user_state.provider);
-          }); // END SHOW modalOmniSignOut
-
-          // Manage post events on modal "modalOmniSignIn"
-          // -------------------------------------------------------------------
-          $("#modalOmniSignIn").on('hidden.bs.modal', function() {
-            if (signIn.do == true) {
-              provider      = signIn.provider.toLowerCase();
-              allowed_users = signIn.users.toString();
-              logText       = 'Provider detected: ' + provider;
-              logger.info(logText);
-              var route = '/authentication?request=signin&provider=' +provider+ '&allowed_users=' +allowed_users;
-              logText = 'Call middleware for route ' +route+ ' for signin';
-              logger.info(logText);
-              window.location.href = route;
-            } else {
-              provider = signIn.provider.toLowerCase();
-              logText = 'Provider detected: ' + provider;
-              logger.info(logText);
-              logText = 'Login for ' +provider+ " declined";
-              logger.info(logText);
-            }
-          }); // END post events "modalOmniSignIn"
-
-          // Manage post events on modal "modalOmniSignOut"
-          // -------------------------------------------------------------------
-          $("#modalOmniSignOut").on('hidden.bs.modal', function() {
-            if (signOut.do == true) {
-              logger.info('Load active provider from cookie: ' + cookie_user_session_name);
-              
-              user_state    = j1.readCookie(cookie_user_session_name);
-              provider      = user_state.provider;
-              provider_url  = user_state.provider_site_url;
-
-              logText = 'Provider detected: ' + provider;
-              logger.info(logText);
-              logText = 'Initiate signout for ' +provider;
-              logger.info(logText);
-              // var route = '/authentication?request=signout&provider=' + provider + '&provider_signout=' + signOut.providerSignOut + '&provider_url=' + provider_url;
-              var route = '/authentication?request=signout&provider=' + provider + '&provider_signout=' + signOut.providerSignOut; // + '/logout/';
-              logText = 'Call middleware: ' +route;
-              logger.info(logText);
-              window.location.href = route;
-            } else {
-              provider = signOut.provider.toLowerCase();
-              logText = 'Provider detected: ' + provider;
-              logger.info(logText);
-              logText = 'SignOut for ' +provider+ " declined";
-              logger.info(logText);
-            }
-          }); // END post events "modalSignOut"
-
-          logText = "Initialize events finished";
+      // Manage pre events on modal "modalOmniSignIn"
+      // -------------------------------------------------------------------
+      $("#modalOmniSignOut").on('show.bs.modal', function() {
+          var modal = $(this);
+          logger.info('Place current user data');
+          user_state = j1.readCookie(cookie_user_session_name);
+          modal.find('.user-info').text('You are signed in to provider: ' + user_state.provider);
+      }); // END SHOW modalOmniSignOut
+
+      // Manage post events on modal "modalOmniSignIn"
+      // -------------------------------------------------------------------
+      $("#modalOmniSignIn").on('hidden.bs.modal', function() {
+        if (signIn.do == true) {
+          provider      = signIn.provider.toLowerCase();
+          allowed_users = signIn.users.toString();
+          logText       = 'Provider detected: ' + provider;
+          logger.info(logText);
+          var route = '/authentication?request=signin&provider=' +provider+ '&allowed_users=' +allowed_users;
+          logText = 'Call middleware for route ' +route+ ' for signin';
           logger.info(logText);
+          window.location.href = route;
+        } else {
+          provider = signIn.provider.toLowerCase();
+          logText = 'Provider detected: ' + provider;
+          logger.info(logText);
+          logText = 'Login for ' +provider+ " declined";
+          logger.info(logText);
+        }
+      }); // END post events "modalOmniSignIn"
 
-          // clear interval checking
-      //     clearInterval(modalsLoaded);
-      // 
-      //   } // END Manage cookie consent dialog
-      // }, 50); // END setInterval
+      // Manage post events on modal "modalOmniSignOut"
+      // -------------------------------------------------------------------
+      $("#modalOmniSignOut").on('hidden.bs.modal', function() {
+        if (signOut.do == true) {
+          logger.info('Load active provider from cookie: ' + cookie_user_session_name);
+
+          user_state    = j1.readCookie(cookie_user_session_name);
+          provider      = user_state.provider;
+          provider_url  = user_state.provider_site_url;
+
+          logText = 'Provider detected: ' + provider;
+          logger.info(logText);
+          logText = 'Initiate signout for ' +provider;
+          logger.info(logText);
+          // var route = '/authentication?request=signout&provider=' + provider + '&provider_signout=' + signOut.providerSignOut + '&provider_url=' + provider_url;
+          var route = '/authentication?request=signout&provider=' + provider + '&provider_signout=' + signOut.providerSignOut; // + '/logout/';
+          logText = 'Call middleware: ' +route;
+          logger.info(logText);
+          window.location.href = route;
+        } else {
+          provider = signOut.provider.toLowerCase();
+          logText = 'Provider detected: ' + provider;
+          logger.info(logText);
+          logText = 'SignOut for ' +provider+ " declined";
+          logger.info(logText);
+        }
+      }); // END post events "modalSignOut"
+
+      logText = "initialize events completed";
+      logger.info(logText);
 
       return true;
     }, // END modalEventHandler
 
     // -------------------------------------------------------------------------
+    // setCSS
     // Set dynamic CSS styles
     // -------------------------------------------------------------------------
-    setCss: function ( navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions ) {
-
-      // BS4 media breakpoints
-      var gridBreakpoint_lg          = '992px';
-      var gridBreakpoint_md          = '768px';
-      var gridBreakpoint_sm          = '576px';
+    setCSS: function (navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions) {
+      var logger              = log4javascript.getLogger("j1.adapter.navigator.setCSS");
+      var gridBreakpoint_lg   = '992px';
+      var gridBreakpoint_md   = '768px';
+      var gridBreakpoint_sm   = '576px';
 
       {% comment %} Resolve symbolic font sizes
       -------------------------------------------------------------------------- {% endcomment %}
@@ -662,8 +543,8 @@ j1.adapter['navigator'] = (function (j1, window) {
       {% comment %} Set|Resolve navBarOptions
       -------------------------------------------------------------------------- {% endcomment %}
       navBarOptions.background_color_full             = j1.setColorData(navBarOptions.background_color_full);
-      navBarOptions.background_color_collapsed        = j1.setColorData(navBarOptions.background_color_collapsed);
-      navBarOptions.background_color_scrolled         = j1.setColorData(navBarOptions.background_color_scrolled);
+//    navBarOptions.background_color_collapsed        = j1.setColorData(navBarOptions.background_color_collapsed);
+//    navBarOptions.background_color_scrolled         = j1.setColorData(navBarOptions.background_color_scrolled);
 
       {% comment %} Set|Resolve navMenuOptions
       -------------------------------------------------------------------------- {% endcomment %}
@@ -695,15 +576,28 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       {% comment %} navBar styles
       -------------------------------------------------------------------------- {% endcomment %}
+      var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
+      var bg_scrolled   = bg_primary
+      var bg_collapsed  = bg_primary;
+
+      $('head').append('<style>.mdi-bg-primary {color: ' +bg_scrolled+ ';}</style>');
+
       // Size of brand image
       $('head').append("<style>.navbar-brand > img { height: {{brand_image_height}}px !important; }</style>");
       // Navbar transparent-light (light)
       $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-transparent.light { background-color: " +navBarOptions.background_color_full+ " !important; border-bottom: solid 0px !important; } }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-scrolled.light { background-color: " +navBarOptions.background_color_scrolled+ " !important; } }</style>");
+
+//    $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-scrolled.light { background-color: " +navBarOptions.background_color_scrolled+ " !important; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-scrolled.light { background-color: " +bg_scrolled+ " !important; } }</style>");
+
+      // Menubar collapsed (mobile)
+      $('head').append('<style>.navbar-collapse.collapse.show { background-color: ' +bg_scrolled+ ' !important; }</style>');
+
 
       /* Navbar media-queries, LARGE Window|Desktop (>= 1024) */
       /* jadams:  Oversized menu bar fixed by: overflow: hidden */
-      $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ " !important; overflow: hidden; } }</style>");
+//    $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ " !important; overflow: hidden; } }</style>");
+      $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator { background-color: " +bg_collapsed+ " !important; overflow: hidden; } }</style>");
       //$('head').append("<style>@media (max-width: 1023px) { row { margin-left: 0 !important; margin-right: 0 !important; } }</style>");
 
       {% comment %} navQuicklinks styles
@@ -742,7 +636,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "px; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1rem; top: calc( 90px + " +navMenuOptions.dropdown_border_height+ "px ); } }</style>");
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "em; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1em; } }</style>");
       // jadams, 2017-11-30: removed left padding from dropdown mwenu (for new j1nav style based on Navigator|Slate)
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ " !important; width: " +navMenuOptions.dropdown_item_width+ "emm!important; border-top: solid " +navMenuOptions.dropdown_border_top+ "px !important; border-radius: " +navMenuOptions.dropdown_border_radius+ "px !important; left: 0; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +bg_scrolled+ " !important; width: " +navMenuOptions.dropdown_item_width+ "emm!important; border-top: solid " +navMenuOptions.dropdown_border_top+ "px !important; border-radius: " +navMenuOptions.dropdown_border_radius+ "px !important; left: 0; } }</style>");
 
       {% if dropdown_style == 'raised' %}
       $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } }</style>");
@@ -777,18 +671,18 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append("<style>.side { background-color: " +navSidebarOptions.background_color+ " !important; }</style>");
 
       return true;
-    }, // END setCss
+    }, // END setCSS
 
     // -------------------------------------------------------------------------
+    //  delayShowMenu
     //  delay all dropdown menu to open for "delay" time
-    //  http://jsfiddle.net/AndreasPizsa/NzvKC/
+    //  See: http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
     delayShowMenu: function () {
+      var logger      = log4javascript.getLogger("j1.adapter.navigator.delayShowMenu");
+      var theTimer    = 0;
+      var theElement  = null;
 
-      var theTimer = 0;
-      var theElement = null;
-
-      var logger = log4javascript.getLogger("j1.adapter.navigator");
       logText = "entered delayShowMenu"
       logger.info(logText);
 
@@ -800,8 +694,8 @@ j1.adapter['navigator'] = (function (j1, window) {
           //if (theElement) theElement.css("display", "none");
           //window.clearTimeout(theTimer);
 
-          //theTimer = window.setTimeout(function () {
-           setTimeout(function () {
+          //theTimer = window.setTimeout (function () {
+           setTimeout (function () {
             theElement.addClass('open');
             //theElement.css("display", "block");
             //window.clearTimeout(theTimer);
@@ -810,8 +704,8 @@ j1.adapter['navigator'] = (function (j1, window) {
         .on('mousemove', function (inEvent) {
           if (theElement.hasClass('open')) return true;
           //window.clearTimeout(theTimer);
-          //theTimer = window.setTimeout(function () {
-           setTimeout(function () {
+          //theTimer = window.setTimeout (function () {
+           setTimeout (function () {
             theElement.addClass('open');
             //window.clearTimeout(theTimer);
           }, {{menuOpenDelay}});
@@ -819,8 +713,8 @@ j1.adapter['navigator'] = (function (j1, window) {
         .on('mouseleave', function (inEvent) {
           //window.clearTimeout(theTimer);
           theElement = $(this);
-          //theTimer = window.setTimeout(function () {
-           setTimeout(function () {
+          //theTimer = window.setTimeout (function () {
+           setTimeout (function () {
             theElement.removeClass('open');
             //window.clearTimeout(theTimer);
           }, {{menuOpenDelay}});
@@ -830,12 +724,12 @@ j1.adapter['navigator'] = (function (j1, window) {
     }, // END delayShowMenu
 
     // -------------------------------------------------------------------------
-    // messageHandler: MessageHandler for J1 NAV module
+    // messageHandler
     // Manage messages (paylods) send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -843,7 +737,9 @@ j1.adapter['navigator'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
       if ( message.type === 'command' && message.action === 'status' ) {
@@ -858,17 +754,19 @@ j1.adapter['navigator'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function ( stat ) {
-      state = stat;
+      j1.adapter.navigator.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.navigator.state;
     } // END state
 
   }; // END return
@@ -877,4 +775,4 @@ j1.adapter['navigator'] = (function (j1, window) {
 {% endcapture %}
 
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}