j1-template 2021.1.6 → 2021.1.7

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

@@ -299,7 +299,6 @@ j1.adapter['navigator'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // data loader
       // -----------------------------------------------------------------------
-
       j1.xhrData({
         xhr_container_id:   navQuicklinksOptions.xhr_container_id,
         xhr_data_path:      navQuicklinksOptions.xhr_data_path,
@@ -319,171 +318,131 @@ j1.adapter['navigator'] = (function (j1, window) {
         'j1.adapter.navigator',
         'data_loaded');
 
-      var dependencies_met_load_menu_finished = setInterval (function () {
-        if (j1.xhrDOMState['#'+navQuicklinksOptions.xhr_container_id] == 'not loaded' ||
-            j1.xhrDOMState['#'+navAuthClientConfig.xhr_container_id] == 'not loaded' ||
-            j1.xhrDOMState['#'+navMenuOptions.xhr_container_id] == 'not loaded' ){
-          logger.error('load HTML data (AJAX): failed');
-          _this.setState('finished');
-          logger.info('state: ' + _this.getState());
-          logger.info('initializing module: failed');
-          logger.info('met dependencies for: xhrData');
-          clearInterval(dependencies_met_load_menu_finished);
-        }
-        // continue if all AJAX loads (xhrData) has finished
-        if (j1.xhrDOMState['#'+navQuicklinksOptions.xhr_container_id] == 'success' &&
-            j1.xhrDOMState['#'+navAuthClientConfig.xhr_container_id] == 'success' &&
-            j1.xhrDOMState['#'+navMenuOptions.xhr_container_id] == 'success' ){
-          _this.setState('processing');
-          logger.info('status: ' + _this.getState());
-          logger.info('initialize navigator core');
-
-          // Detect|Set J1 App status
-          appDetected       = j1.appDetected();
-          authClientEnabled = j1.authEnabled();
-          logger.info('application status detected: ' + appDetected);
-
-          j1.core.navigator.init (
-            _this.navDefaults,
-            _this.navMenuOptions
-          );
-
-          // _this.delayShowMenu( 200 );
-
-          // cast text-based booleans
-          // themerEnabled = ({{themer_options.enabled }} === 'true');
-
-          // load themes (to menu) if themer is enabled|finished
-          if (themerEnabled) {
-
-            logText = 'theme switcher: enabled';
-            logger.info(logText);
-
-            // 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);
-            }
+        var dependencies_met_load_menu_finished = setInterval (function () {
+  	      if (j1.xhrDOMState['#'+navQuicklinksOptions.xhr_container_id] === 'success' &&
+            j1.xhrDOMState['#'+navAuthClientConfig.xhr_container_id] === 'success' &&
+            j1.xhrDOMState['#'+navMenuOptions.xhr_container_id] === 'success' ) {
+            // continue if all AJAX loads (xhrData) has finished
+            _this.setState('processing');
+            logger.info('status: ' + _this.getState());
+            logger.info('initialize navigator core');
 
-            var dependencies_met_page_finished = setInterval(function() {
-//            jadams, 2020-10-03: NOT needed to wait for j1 get finished
-//            if (j1.getState() == 'finished') {
-//            jadams, 2021-06-22: disabled check on themer get finished
-//            if (j1.adapter.themer.getState() == 'finished') {
-              if ('true' === 'true') {
-                // initialize theme switcher menus
-
-                logText = 'load themes';
-                logger.info(logText);
-
-                // load LOCAL themes from JSON data
-                logText = 'load local themes (json file)';
-                logger.info(logText);
-                $('#local_themes').bootstrapThemeSwitcher({
-                  localFeed: themerOptions.localThemes
-                });
-
-                // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
-                $('#remote_themes').bootstrapThemeSwitcher({
-                  localFeed: '',
-                  bootswatchApiVersion: themerOptions.bootswatchApiVersion
-                });
-
-                // jadams, 2021-04-22: Up to now, it is unclear why in some
-                // cases the menu bar is NOT fully loaded for THEMES
-                // TODO: Add additional checks to find the reason
-
-                // added same checks (as already done by adapter themer) to
-                // check if remote theme menu detected as LOADED
-                //
-                var dependencies_met_remote_themes_loaded = setInterval(function() {
-                  interval_count += 1;
-                  themes_count = document.getElementById("remote_themes").getElementsByTagName("li").length;
-                  if ( themes_count > 0  ) {
-                    logger.info('remote themes loaded: successfully');
-                    logger.info('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
-
-                    clearInterval(dependencies_met_remote_themes_loaded);
-//                  clearInterval(dependencies_met_page_finished);
-                  } else {
-                      logger.debug('wait for theme to be loaded: ' + user_state.theme_name);
-                  }
-                  if (interval_count > max_count) {
-                    logger.warn('remote themes loading: failed');
-                    logger.warn('continue processing');
-                    clearInterval(dependencies_met_remote_themes_loaded);
-//                  clearInterval(dependencies_met_page_finished);
-                  }
-                  clearInterval(dependencies_met_page_finished);
-                }, 25);
-
-//              clearInterval(dependencies_met_page_finished);
-              }
-              _this.setState('initialized');
-            }, 25); // END 'dependencies_met_page_finished'
-          } else {
-            logText = 'theme switcher detected as: disabled';
-            logger.info(logText);
-          }
+            // Detect|Set J1 App status
+            appDetected       = j1.appDetected();
+            authClientEnabled = j1.authEnabled();
+            logger.info('application status detected: ' + appDetected);
+
+            j1.core.navigator.init (_this.navDefaults, _this.navMenuOptions);
 
-          // -----------------------------------------------------------------
-          // event handler|css styles
-          // -----------------------------------------------------------------
-          // continue if Theme CSS is applied
-          var dependencies_met_themer_finished = setInterval(function() {
+            // load themes (to menu) if themer is enabled|finished
             if (themerEnabled) {
-              if (j1.adapter.themer.getState() === 'finished') {
-                _this.setState('processing');
+              logText = 'theme switcher: enabled';
+              logger.info(logText);
+
+              // 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);
+              }
 
-                logger.info('initialize eventHandler');
-                j1.core.navigator.eventHandler();
-
-                var dependencies_met_page_finished = setInterval(function() {
-                  if (j1.getState() == 'finished') {
-                    // set general|global theme colors
-                    logger.info('initializing dynamic CSS styles: started');
-                    _this.setCSS (
-                      navDefaults, navBarOptions, navMenuOptions,
-                      navQuicklinksOptions, navTopsearchOptions
-                    );
+              // jadams, 2021-07-03: wait until navigator CORE get finished
+              var dependencies_met_page_finished = setInterval(function() {
+                if (j1.adapter.navigator.getState() == 'core_initialized') {
+                  logText = 'load themes';
+                  logger.info(logText);
+
+                  // load LOCAL themes from JSON data
+                  logText = 'load local themes (json file)';
+                  logger.info(logText);
+                  $('#local_themes').bootstrapThemeSwitcher({
+                    localFeed: themerOptions.localThemes
+                  });
+
+                  // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
+                  $('#remote_themes').bootstrapThemeSwitcher({
+                    localFeed: '',
+                    bootswatchApiVersion: themerOptions.bootswatchApiVersion
+                  });
+
+                  // jadams, 2021-04-22: Up to now, it is unclear why in some
+                  // cases the menu bar is NOT fully loaded for THEMES
+                  // TODO: Add additional checks to find the reason
+
+                  // added same checks (as already done by adapter themer) to
+                  // check if remote theme menu detected as LOADED
+                  //
+                  var dependencies_met_remote_themes_loaded = setInterval(function() {
+                    interval_count += 1;
+                    themes_count = document.getElementById("remote_themes").getElementsByTagName("li").length;
+                    if ( themes_count > 0  ) {
+                      logger.info('remote themes loaded: successfully');
+                      logger.info('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+
+                      clearInterval(dependencies_met_remote_themes_loaded);
+                    } else {
+                        logger.debug('wait for theme to be loaded: ' + user_state.theme_name);
+                    }
+                    if (interval_count > max_count) {
+                      logger.warn('remote themes loading: failed');
+                      logger.warn('continue processing');
+                      clearInterval(dependencies_met_remote_themes_loaded);
+                    }
                     clearInterval(dependencies_met_page_finished);
-                  }
-                  logger.info('initializing dynamic CSS styles: finished');
-                }, 25); // END 'dependencies_met_page_finished'
+                  }, 25);
+                }
+                _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 themer|navigator are INITIALIZED
+            var dependencies_met_initialized = setInterval(function() {
+              if (themerEnabled) {
+                if (j1.adapter.navigator.getState() === 'initialized') {
+                  _this.setState('processing');
+
+                  // set general|global theme colors
+                  logger.info('initializing dynamic CSS styles');
+                  _this.setCSS (
+                    navDefaults, navBarOptions, navMenuOptions,
+                    navQuicklinksOptions, navTopsearchOptions
+                  );
+
+                  logger.info('init auth client');
+                  _this.initAuthClient(_this.navAuthManagerConfig);
+
+                  _this.setState('finished');
+                  logger.info('state: ' + _this.getState());
+                  logger.info('module initialized successfully');
+                  logger.info('met dependencies for: j1');
+                  clearInterval(dependencies_met_initialized);
+                }
+              } else {
+                _this.setState('processing');
+
+                // set general|global theme colors
+                logger.info('apply dynamic CSS styles');
+                _this.setCSS (
+                  navDefaults, navBarOptions, navMenuOptions,
+                  navQuicklinksOptions, navTopsearchOptions
+                );
 
                 logger.info('init auth client');
                 _this.initAuthClient(_this.navAuthManagerConfig);
-
                 _this.setState('finished');
                 logger.info('state: ' + _this.getState());
-                logger.info('module initialized successfully');
-                logger.info('met dependencies for: j1');
-                clearInterval(dependencies_met_themer_finished);
+                clearInterval(dependencies_met_initialized);
               }
-            } else {
-              _this.setState('processing');
-
-              logger.info('initialize eventHandler');
-              j1.core.navigator.eventHandler();
-
-              // set general|global theme colors
-              logger.info('apply dynamic CSS styles');
-              _this.setCSS (
-                navDefaults, navBarOptions, navMenuOptions,
-                navQuicklinksOptions, navTopsearchOptions
-              );
-
-              logger.info('init auth client');
-              _this.initAuthClient(_this.navAuthManagerConfig);
-              _this.setState('finished');
-              logger.info('state: ' + _this.getState());
-              clearInterval(dependencies_met_themer_finished);
-            }
-          }, 25); // END 'dependencies_met_themer_finished'
-          logger.info('met dependencies for: themer');
-          clearInterval(dependencies_met_load_menu_finished);
-        }
-      }, 25); // END 'dependencies_met_load_menu_finished'
+            }, 25); // END 'dependencies_met_initialized'
+            logger.info('met dependencies for: themer');
+            clearInterval(dependencies_met_load_menu_finished);
+          }
+        }, 25); // END 'dependencies_met_load_menu_finished'
 
       // --------------------------------------------------------------------
       // Register event 'reset on resize' to call j1.core.navigator on
@@ -506,16 +465,9 @@ j1.adapter['navigator'] = (function (j1, window) {
         }, 500);
 
         // Scroll the page one pixel back and forth to get
-        // the right position for Toccer (trigger) and SSM
+        // the right position for the toccer
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
-
-        // jadams, 2020-06-21: unclear|forgotten what I'm doing here!
-        // Looks like the old BS3 implementation
-        //
-        // $('.navbar-collapse').removeClass('in');
-        // $('.navbar-collapse').removeClass('on');
-        // $('.navbar-collapse').removeClass('bounceIn');
       });
     }, // END init
 
@@ -685,17 +637,19 @@ j1.adapter['navigator'] = (function (j1, window) {
       var gridBreakpoint_sm   = '576px';
       var navPrimaryColor     = navDefaults.nav_primary_color;
 
-      {% comment %} Set|Resolve navMenuOptions
-      -------------------------------------------------------------------------- {% endcomment %}
+      logger.info('set dynamic styles for the theme loaded');
+
+      // Set|Resolve navMenuOptions
+      // ------------------------------------------------------------------------
       navMenuOptions.dropdown_font_size               = navMenuOptions.dropdown_font_size;
       navMenuOptions.megamenu_font_size               = navMenuOptions.megamenu_font_size;
 
-      {% comment %} Set|Resolve navBarOptions
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set|Resolve navBarOptions
+      // -----------------------------------------------------------------------
       navBarOptions.background_color_full             = navBarOptions.background_color_full;
 
-      {% comment %} Set|Resolve navMenuOptions
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set|Resolve navMenuOptions
+      // -----------------------------------------------------------------------
       navMenuOptions.menu_item_color                  = navMenuOptions.menu_item_color;
       navMenuOptions.menu_item_color_hover            = navMenuOptions.menu_item_color_hover;
       navMenuOptions.menu_item_dropdown_color         = navMenuOptions.menu_item_dropdown_color;
@@ -704,24 +658,23 @@ j1.adapter['navigator'] = (function (j1, window) {
       navMenuOptions.dropdown_background_color_active = navMenuOptions.dropdown_background_color_active;
       navMenuOptions.dropdown_border_color            = navMenuOptions.dropdown_border_color;
 
-      {% comment %} Set|Resolve navQuicklinksOptions
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set|Resolve navQuicklinksOptions
+      // -----------------------------------------------------------------------
       navQuicklinksOptions.icon_color                 = navQuicklinksOptions.icon_color;
       navQuicklinksOptions.icon_color_hover           = navQuicklinksOptions.icon_color_hover;
       navQuicklinksOptions.background_color           = navQuicklinksOptions.background_color;
 
-      {% comment %} Set|Resolve navTopsearchOptions
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set|Resolve navTopsearchOptions
+      // -----------------------------------------------------------------------
       navTopsearchOptions.input_color                 = navTopsearchOptions.input_color;
       navTopsearchOptions.background_color            = navTopsearchOptions.background_color;
 
-      {% comment %} Set dymanic styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set dymanic styles
+      // -----------------------------------------------------------------------
       // $('nav-primary').css({"background-color": "navPrimaryColor"});
 
-
-      {% comment %} navBar styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // navBar styles
+      // -----------------------------------------------------------------------
       var bg_primary    = j1.getStyleValue('bg-primary', 'background-color');
       var bg_scrolled   = bg_primary;
       var bg_collapsed  = bg_primary;
@@ -743,13 +696,13 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_sm+ ') { nav.navbar.navigator.navbar-transparent.light { background-color: ' +navBarOptions.background_color_full+ ' !important; border-bottom: solid 0px !important; } }</style>');
       $('head').append('<style id="dynNav">@media (max-width: ' +gridBreakpoint_sm+ ') { nav.navbar.navigator.navbar-scrolled.light { background-color: ' +bg_scrolled+ ' !important; } }</style>');
 
-      {% comment %} navQuicklinks styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // navQuicklinks styles
+      // -----------------------------------------------------------------------
       $('head').append('<style>.attr-nav> ul > li > a { color: ' +navQuicklinksOptions.icon_color+ ' !important; }</style>');
       $('head').append('<style>.attr-nav> ul > li > a:hover { color: ' +navQuicklinksOptions.icon_color_hover+ ' !important; }</style>');
 
-      {% comment %} navMenu styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // navMenu styles
+      // -----------------------------------------------------------------------
       // Remove background for anchor
       $('head').append('<style>.dropdown-menu > .active > a { background-color: transparent !important; }</style>');
       // hover menu-item|menu-sub-item
@@ -778,40 +731,40 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.dropdown_font_size+ ' !important; font-weight: 400; } }</style>');
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.dropdown-menu.megamenu-content .content ul.menu-col li a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.megamenu_font_size+ ' !important; font-weight: 400; } }</style>');
 
-      {% comment %} navQuicklinks styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // navQuicklinks styles
+      // -----------------------------------------------------------------------
 
-      {% comment %} navTopSearch Styles
-      -------------------------------------------------------------------------- {% endcomment %}
-//    jadams, 2020-07-08: disabled because colors for icons set by the icon font settings
+      // navTopSearch Styles
+      // -----------------------------------------------------------------------
+      // jadams, 2020-07-08: disabled because colors for icons set by the icon font settings
 //    $('head').append('<style>.top-search .input-group-addon { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
       $('head').append('<style>.top-search { background-color: ' +navTopsearchOptions.background_color+ ' !important; }</style>');
       $('head').append('<style>.top-search input.form-control { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
 
-      {% comment %} Timeline styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Timeline styles
+      // -----------------------------------------------------------------------
   	  $('head').append('<style>.timeline > li > .timeline-panel:after {border-right-color: ' +bg_scrolled+ '; border-left-color: ' +bg_scrolled+ ';}</style>');
       $('head').append('<style>.tmicon {background: ' +bg_scrolled+ ';}</style>');
 
-      {% comment %} Heading styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Heading styles
+      // -----------------------------------------------------------------------
       $('head').append('<style>.heading:after {background: ' +bg_scrolled+ ' !important;}</style>');
 
-      {% comment %} Tag Cloud styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Tag Cloud styles
+      // -----------------------------------------------------------------------
       $('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>');
 
-      {% comment %} Toccer styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Toccer styles
+      // -----------------------------------------------------------------------
       $('head').append('<style>.is-active-link::before {background-color: ' +bg_scrolled+ ' !important;}</style>');
 
-      {% comment %} BS extended Modal styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // BS extended Modal styles
+      // -----------------------------------------------------------------------
       $('head').append('<style>.modal-dialog.modal-notify.modal-primary .modal-header {background-color: ' +bg_scrolled+ ';}</style>');
 
-      {% comment %} BS nav|pills styles
-      -------------------------------------------------------------------------- {% endcomment %}
+      // BS nav|pills styles
+      // -----------------------------------------------------------------------
       $('head').append('<style>.nav-pills .nav-link.active, .nav-pills .show > .nav-link {background-color: ' +bg_scrolled+ ' !important;}</style>');
 
       return true;
@@ -875,9 +828,13 @@ j1.adapter['navigator'] = (function (j1, window) {
     messageHandler: function (sender, message) {
       // var json_message = JSON.stringify(message, undefined, 2);              // multiline
       var json_message = JSON.stringify(message);
+      _this.setState(message.action);
 
       logText = 'received message from ' + sender + ': ' + json_message;
-      logger.debug(logText);
+      logger.info(logText);
+
+      logText = 'set state to: ' + message.action;
+      logger.info(logText);
 
       // -----------------------------------------------------------------------
       //  Process commands|actions