j1_template_mde 2018.4.32 → 2018.4.33

data/lib/starter_web/assets/themes/j1/core/js/adapter/scroller.js

@@ -58,12 +58,14 @@ regenerate:                         true
 --------------------------------------------------------------- {% endcomment %}
 
 j1.Scroller = (function (j1, window) {
+
   var environment = '{{environment}}'; // Set environment
-  var state       = 'unknown';
+  var state       = 'not_started';
   var logger;
   var logText;
 
   return {
+
     // Initialize
     init: function () {
       // Setup logger
@@ -92,16 +94,17 @@ j1.Scroller = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
       logger.info("SmoothScroll initialized successfully");
 
-    }, // end init
+      return;
+    }, // END init
 
     // -------------------------------------------------------------------------
     //  returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    }
+    } // END state
 
-  }; // end return
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

data/lib/starter_web/assets/themes/j1/core/js/adapter/searcher.js

@@ -48,59 +48,63 @@ regenerate:                         true
 'use strict';
 
 {% comment %} Variables
-   ------------------------------------------------------------ {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign environment   = site.environment %}
 {% assign config        = site.data.modules.j1_jekyll_search %}
 
 
 {% comment %} Main
-   ------------------------------------------------------------ {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% if config.enabled %}
 
-  j1.Searcher = (function (j1, window) {
-    var environment = '{{environment}}'; // Set environment
-    var state       = 'unknown';
-    var logger;
-    var logText;
-
-    return {
-      // Initialize
-      init: function () {
-        // Setup logger
-        logger = log4javascript.getLogger("j1.QuickSearch.adapter");
-        logger.info("Jekyll Search is being initialized");
-        state = 'started';
-        logger.info('state: ' + state); // Set|Log status
-
-        var jekyllSearch = SimpleJekyllSearch({
-          searchInput:            document.getElementById( {{config.search_input | json }} ),
-          resultsOutput:          document.getElementById( {{config.results_output | json }} ),
-          resultsContainer:       document.getElementById( {{config.results_container | json }} ),
-          json:                   {{config.index_data | json }},
-          searchResultTemplate:   {{config.result_template | json }},
-          limit:                  {{config.result_limit | json }},
-          minSearchItemLen:       {{config.min_search_item_len | json }},
-          fuzzy:                  {{config.search_fuzzy | json }},
-          exclude:                [ {{config.search_exlude| json }} ],
-          noResultsText:          {{quick_search_quick_search_config.no_results_text | json }}
-        });
-
-        state = 'finished';
-        logger.info("Jekyll Search initialized successfully");
-        logger.info('state: ' + state); // Set|Log status
-      }, // end init
-
-      // -------------------------------------------------------------------------
-      //  returns the current (processing) state of the module
-      // -------------------------------------------------------------------------
-      state: function () {
-        return state;
-      }
-
-    }; // end return
-
+j1.Searcher = (function (j1, window) {
+
+  var environment = '{{environment}}'; // Set environment
+  var state       = 'not_started';
+  var logger;
+  var logText;
+
+  return {
+
+    // Initialize
+    init: function () {
+
+      // Setup logger
+      logger = log4javascript.getLogger("j1.QuickSearch.adapter");
+      logger.info("Jekyll Search is being initialized");
+      state = 'started';
+      logger.info('state: ' + state); // Set|Log status
+
+      var jekyllSearch = SimpleJekyllSearch({
+        searchInput:            document.getElementById( {{config.search_input | json }} ),
+        resultsOutput:          document.getElementById( {{config.results_output | json }} ),
+        resultsContainer:       document.getElementById( {{config.results_container | json }} ),
+        json:                   {{config.index_data | json }},
+        searchResultTemplate:   {{config.result_template | json }},
+        limit:                  {{config.result_limit | json }},
+        minSearchItemLen:       {{config.min_search_item_len | json }},
+        fuzzy:                  {{config.search_fuzzy | json }},
+        exclude:                [ {{config.search_exlude| json }} ],
+        noResultsText:          {{quick_search_quick_search_config.no_results_text | json }}
+      });
+
+      state = 'finished';
+      logger.info("Jekyll Search initialized successfully");
+      logger.info('state: ' + state); // Set|Log status
+
+      return;
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    //  returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    state: function () {
+      return state;
+    } // END state
+
+  }; // END return
 })(j1, window);
 
 {% endif %}

data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js

@@ -55,13 +55,15 @@ regenerate:                             true
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 j1.Stickybits = (function (j1, window) {
+
   var environment = '{{environment}}'; // Set environment
-  var state       = 'unknown';
+  var state       = 'not_started';
   var logger;
   var logText;
   var stickybitsInstance;
 
   return {
+
     // Initialize
     init: function () {
       // Setup logger
@@ -77,17 +79,18 @@ j1.Stickybits = (function (j1, window) {
       state = 'finished';
       logger.info('state: ' + state); // Set|Log status
       logger.info("J1 Stickybits successfully initialized");
-    },
+
+      return;
+    }, // END init
 
     // -------------------------------------------------------------------------
     //  returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    }
+    } // END init
 
   }; // end return
-
 })(j1, window);
 
 {% endcapture %}

data/lib/starter_web/assets/themes/j1/core/js/adapter/switcher.js

@@ -49,12 +49,14 @@ regenerate:                         true
 {% assign config = site.data.modules.j1_theme_switcher %}
 
 j1.Switcher = (function (j1, window) {
+
   var environment = '{{environment}}'; // Set environment
-  var state       = 'unknown';
+  var state       = 'not_started';
   var logger;
   var logText;
 
   return {
+
     // Initialize
     init: function () {
       // Setup logger
@@ -95,16 +97,18 @@ j1.Switcher = (function (j1, window) {
       state = 'finished';
       logger.info('state: ' + state); // Set|Log status
       logger.info("J1 Theme Switcher initialized successfully");
-    }, // end init
+
+      return;
+    }, // END init
 
     // -------------------------------------------------------------------------
     //  returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    }
+    } // END state
 
-  }; // end return
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js

@@ -76,9 +76,7 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 var j1 = function () {
 
-//var environment         = '{{environment}}'; // Set environment
-//var cookieUserState     = 'j1.user.state';
-//
+  var environment         = '{{environment}}'; // Set environment
 
   // Status information
   var state = 'not_started';
@@ -94,7 +92,7 @@ var j1 = function () {
   var j1_colors           = {};
   var colors_data_path    = "/assets/data/colors.json";
   
-// Logger
+  // Logger
   var logger;
   var logText;
 
@@ -177,6 +175,8 @@ var j1 = function () {
           j1.initClipboard(settings);
           j1.displayPage(settings);
       });
+
+      return;
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -293,6 +293,8 @@ var j1 = function () {
           selector.load( banner_data_path, cb_load_closure( id ) );
         }
       }
+
+      return;
     }, // END initBanner
 
     // -------------------------------------------------------------------------
@@ -300,6 +302,7 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initPanel: function ( options ) {
+
       var logger = log4javascript.getLogger('j1.Template.adapter');
       var panel  = [];
 
@@ -356,6 +359,8 @@ var j1 = function () {
           selector.load( panel_data_path, cb_load_closure( id ) );
         }
       }
+
+      return;
     }, // END initPanel
 
     // -------------------------------------------------------------------------
@@ -363,8 +368,8 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initFooter: function ( options ) {
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
 
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
       var logText = 'initFooter: Start initialization';
       logger.info(logText);
 
@@ -390,6 +395,8 @@ var j1 = function () {
         var footer_data_path = '{{footer_data_path}}';
         selector.load( footer_data_path, cb_load_closure( id ) );
       }
+
+      return;
     }, // END initFooter
 
     // -------------------------------------------------------------------------
@@ -397,8 +404,8 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initClipboard: function ( options ) {
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
 
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
       var logText = 'initClipboard: Start initialization';
       logger.info(logText);
 
@@ -442,80 +449,45 @@ var j1 = function () {
         logger.warn(logText);
         $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
       });
+
       return;
     }, // END initClipboard
 
     // -------------------------------------------------------------------------
     // Show the page after timeout of {{hideOnReload}}
+    // Display the page if the (text) header is signaled as 'initialized'
+    // AND the menubar is signaled as (state) 'finished'
     // -------------------------------------------------------------------------
     displayPage: function ( options ) {
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
 
-      var logText = 'Start initialization';
-      logger.info(logText);
+      var settings = options;
 
-      // Display the page if the (text) header is signaled as 'initialized' AND the menubar is signaled as 'finished'
+      logger  = log4javascript.getLogger('j1.displayPage');
+      logText = 'Start to display the page';
+      logger.info(logText);
+      
       var headerLoaded = setInterval(function() {
+
         if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
-          // pause the display of current page for flicker timeout [ms]
-          setTimeout( function() {            
-            $('#no_flicker').css('display', 'block'); // display current page
-            j1.scrollTo(); // scroll to an anchor element this page (if any)
-
-            // Detect|Set J1 App status
-            app_detected = j1.existsCookie ( 'j1.web.session' );
-            if ( app_detected ) {
-              var document_title = document.title;
-              /*
-                TODO: Change|Modify the page title if an app is detected
-                      for development mode
-              */
-              /* document.title = document_title + ' (App)'; */
-              logger.info('displayPage: Site detected in state: app');
-              logger.info('displayPage: Read cookie: WebSession');
-              var j1_web_session = j1.getWebSessionCookie();
-              logger.info('displayPage: Read cookie: UserState');
-              j1_user_state = j1.getUserStateCookie();
-              logger.info( 'displayPage: WebSessionCookie written by: ' + j1_web_session.writer );
-              j1_user_state.authenticated   = j1_web_session.authenticated;
-              j1_user_state.previous_page   = j1_user_state.current_page;
-              j1_user_state.current_page    = window.location.pathname;
-              j1_user_state.provider        = j1_web_session.provider;
-              j1_user_state.user_name       = j1_web_session.user_name;
-              j1_user_state.user_id         = j1_web_session.user_id;
-              logger.info('displayPage: Write cookie: UserState');
-              j1.setUserStateCookie( j1_user_state );
-              j1_web_session.requested_page = window.location.pathname;
-              logger.info('displayPage:Write cookie: WebSession');
-              j1.setWebSessionCookie( j1_web_session );
-              logger.info( 'displayPage: Last page:    ' + j1_user_state.previous_page );
-              logger.info( 'displayPage: Current page: ' + j1_user_state.current_page );
-            } else {
-              logger.info('displayPage: Site detected in state: web');
-              var user_state_detected = j1.existsCookie ( 'j1.user.state' );
-              if ( user_state_detected ) {
-                logger.info('displayPage: Read cookie: UserState');
-                j1_user_state = j1.getUserStateCookie();
-                logger.info('displayPage: Write cookie: UserState');
-              } else {
-                logger.warn('displayPage: Read cookie: UserState not found');
-                logger.info('displayPage: Create and update user state');
-                logger.info('displayPage: Write cookie: UserState');
-              }
-              j1_user_state.previous_page   = j1_user_state.current_page;
-              j1_user_state.current_page    = window.location.pathname;
-              j1.setUserStateCookie( j1_user_state );
-            }
-            // Set|Log status
-            state = 'finished';
-            logger.info('state: ' + state);
-            logText = "displayPage: J1 Template successfully initialized";
-            logger.info(logText);
-          }, {{flickerTimeout}} );
+          $('#no_flicker').css('display', 'block'); // display current page
+          j1.scrollTo(); // scroll to an anchor element this page (if any)
+
+          // Update sidebar
+          logger.info('Update sidebar');
+    	    j1.updateSidebar();
+
+          // Set|Log status
+          state = 'finished';
+          logText = 'state: ' + state;
+          logger.info(logText);
+          logText = "displayPage: J1 Template successfully initialized";
+          logger.info(logText);
+
           // clear interval checking
           clearInterval(headerLoaded);
         }
       }, 50); // END setInterval
+
       return;
     }, // END displayPage
 
@@ -535,6 +507,7 @@ var j1 = function () {
       var logText = 'initMDB Finished initMDB';
       logger.info(logText);
 
+      return;
     }, // END initMDB
 
     // -------------------------------------------------------------------------
@@ -547,12 +520,14 @@ var j1 = function () {
     // See: https://stackoverflow.com/questions/43109229/merge-default-options-containing-object-with-json-object
     // -------------------------------------------------------------------------
     mergeData: function () {
+
       var a = [].slice.call(arguments), o = a.shift();
       for(var i=0,l=a.length; i<l; i++){
         for(var p in a[i]){
           o[p] = a[i][p];
         }
       }
+
       return o;
     },  // END mergeData
 
@@ -561,7 +536,7 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    },
+    }, // END state
 
     // -------------------------------------------------------------------------
     //  Returns the content of a given cookie (name) if exists otherwise
@@ -569,28 +544,30 @@ var j1 = function () {
     //  See: https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists/5968306
     // -------------------------------------------------------------------------
     getCookie: function (name) {
-        var dc      = document.cookie;
-        var prefix  = name + "=";
-        var begin   = dc.indexOf("; " + prefix);
-        var end     = dc.length; // default to end of the string
-
-        // found, and not in first position
-        if (begin !== -1) {
-          // exclude the "; "
-          begin += 2;
-        } else {
-          //see if cookie is in first position
-          begin = dc.indexOf(prefix);
-          // not found at all or found as a portion of another cookie name
-          if (begin === -1 || begin !== 0 ) return null;
-        }
 
-        // if ";" is found somewhere after the prefix position then "end" is
-        // that position, otherwise it defaults to the end of the string
-        if (dc.indexOf(";", begin) !== -1) {
-          end = dc.indexOf(";", begin);
-        }
-        return decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
+      var dc      = document.cookie;
+      var prefix  = name + "=";
+      var begin   = dc.indexOf("; " + prefix);
+      var end     = dc.length; // default to end of the string
+
+      // found, and not in first position
+      if (begin !== -1) {
+        // exclude the "; "
+        begin += 2;
+      } else {
+        //see if cookie is in first position
+        begin = dc.indexOf(prefix);
+        // not found at all or found as a portion of another cookie name
+        if (begin === -1 || begin !== 0 ) return null;
+      }
+
+      // if ";" is found somewhere after the prefix position then "end" is
+      // that position, otherwise it defaults to the end of the string
+      if (dc.indexOf(";", begin) !== -1) {
+        end = dc.indexOf(";", begin);
+      }
+
+      return decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
     }, // END getCookie
 
     // -------------------------------------------------------------------------
@@ -598,25 +575,27 @@ var j1 = function () {
     //  if the web is detected as an app
     // -------------------------------------------------------------------------
     getUserState: function (params, cbData) {
-        var parameters = params == '' ? 'all' : params;
-        var url = '/status?fields=' + parameters;
 
-        if ( j1.existsCookie('j1.web.session') ) {
-          $.ajax({
-            url:      url,
-            success:  function(data) {
-              if (typeof data == 'string') {
-                JSON.parse(data)
-              }
-              if (typeof data == 'object') {
-                data
-              }
-              cbData(data);
+      var parameters = params == '' ? 'all' : params;
+      var url = '/status?fields=' + parameters;
+
+      if ( j1.existsCookie('j1.web.session') ) {
+        $.ajax({
+          url:      url,
+          success:  function(data) {
+            if (typeof data == 'string') {
+              JSON.parse(data)
             }
-          });
-        } else {
-          return { authenticated : false };
-        }
+            if (typeof data == 'object') {
+              data
+            }
+            cbData(data);
+          }
+        });
+      } else {
+        return { authenticated : false };
+      }
+
     }, // END getUserState
 
     // -------------------------------------------------------------------------
@@ -625,8 +604,10 @@ var j1 = function () {
     //  See: https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists/5968306
     // -------------------------------------------------------------------------
     getUserStateCookie: function () {
+
       var user_state;
       var user_state_json;
+
       if ( j1.existsCookie ( 'j1.user.state' ) ) {
         user_state_json = window.atob(Cookies.get('j1.user.state'));
         user_state      = JSON.parse(user_state_json);
@@ -634,6 +615,7 @@ var j1 = function () {
       } else {
         return null;
       }
+
     }, // END getUserStateCookie
 
     // -------------------------------------------------------------------------
@@ -642,6 +624,7 @@ var j1 = function () {
     //  See: https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists/5968306
     // -------------------------------------------------------------------------
     setUserStateCookie: function ( state ) {
+
       // update existing cookie
       if ( j1.existsCookie ( 'j1.user.state' ) ) {
         var state_from_cookie_json  = window.atob(Cookies.get('j1.user.state'));
@@ -658,6 +641,7 @@ var j1 = function () {
         var user_state_encoded      = window.btoa(user_state_json);
         Cookies.set( 'j1.user.state', user_state_encoded, { expires: 365 } );
       }
+
       return;
     }, // END setUserStateCookie
 
@@ -667,7 +651,9 @@ var j1 = function () {
     //  See: https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists/5968306
     // -------------------------------------------------------------------------
     getWebSessionCookie: function () {
+
       var session_data;
+
       if ( j1.existsCookie ( 'j1.web.session' ) ) {
         var session_json = window.atob(Cookies.get('j1.web.session'));
         session_data = JSON.parse(session_json);
@@ -675,6 +661,7 @@ var j1 = function () {
       } else {
         return null;
       }
+
     }, // END getWebSessionCookie
 
     // -------------------------------------------------------------------------
@@ -683,6 +670,7 @@ var j1 = function () {
     //  See: https://stackoverflow.com/questions/5968196/check-cookie-if-cookie-exists/5968306
     // -------------------------------------------------------------------------
     setWebSessionCookie: function ( session_data ) {
+
       if ( j1.existsCookie ( 'j1.web.session' ) ) {
         session_data.writer = 'web';
         var session_json = JSON.stringify(session_data);
@@ -692,12 +680,14 @@ var j1 = function () {
       } else {
         return false;
       }
+
     }, // END setWebSessionCookie
 
     // -------------------------------------------------------------------------
     //  returns true if a given cookie exists
     // -------------------------------------------------------------------------
     existsCookie: function (name) {
+
       var myCookie = j1.getCookie( name );
 
       if (myCookie == null) {
@@ -706,6 +696,7 @@ var j1 = function () {
       else {
         return true;
       }
+
     }, // END existsCookie
 
     // -------------------------------------------------------------------------
@@ -714,8 +705,9 @@ var j1 = function () {
     //  https://stackoverflow.com/questions/1043339/javascript-for-detecting-browser-language-preference
     // -------------------------------------------------------------------------
     getLanguage: function () {
-      //var language = window.navigator.userLanguage || window.navigator.language;
+
       var language = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage);
+
       return language;
     }, // END getLanguage
 
@@ -731,6 +723,7 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // values for delay|offset are taken from TOC module (Tocbot)
     scrollTo: function () {
+
       // Unclear why a correction is needed sometimes. Disable for now.
       //var offset_correction = 75;
       var offset_correction = 25;
@@ -765,6 +758,7 @@ var j1 = function () {
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
       } // END if anchor_id
+
       return;
     }, // END scrollTo
 
@@ -778,6 +772,7 @@ var j1 = function () {
     //  https://stackoverflow.com/questions/179713/how-to-change-the-href-for-a-hyperlink-using-jquery
     // -------------------------------------------------------------------------
     resolveMacros: function ( data ) {
+
       var logger;
       var logText;
       var user_state   = data;
@@ -848,8 +843,8 @@ var j1 = function () {
           var $html = $this.html();
           $this.html($html.replace('??theme-version', user_state.theme_version));
         });
-
       }); // END Replace macros
+
       return;
     }, // END resolveMacros
 
@@ -862,6 +857,7 @@ var j1 = function () {
     // updated
     // -------------------------------------------------------------------------
     updateMacros: function ( data ) {
+
       var user_state = data;
       var logger;
       var logText;
@@ -893,6 +889,7 @@ var j1 = function () {
           $this.html($html.replace(/guest|member/, user_state.provider_membership));
         });
       });
+
       return;
     }, // END updateMacros
 
@@ -905,6 +902,7 @@ var j1 = function () {
     // updated
     // -------------------------------------------------------------------------
     hasPageChanged: function ( data ) {
+
       var user_state = data;
       var logger;
       var logText;
@@ -913,14 +911,16 @@ var j1 = function () {
         return false;
       } else {
         return true;
-      }      
-    }, // END j1.hasPageChanged
+      }
+
+    }, // END hasPageChanged
 
     // -------------------------------------------------------------------------
     // updateCookies:
     //
     // -------------------------------------------------------------------------
     updateCookies: function ( data ) {
+
       var user_state        = data;
       var appDetected       = j1.Navigator.appDetected();
       var authClientEnabled = j1.Navigator.authClientEnabled();
@@ -937,18 +937,7 @@ var j1 = function () {
         web_session_state = j1.getWebSessionCookie();
         userAuthenticated = web_session_state.authenticated === 'true' ? true : false;
 
-        // Overload middleware settings
-        // if ( authClientEnabled && web_session_state.authenticated === 'false' ) {
-        //   web_session_state.provider_permissions = user_state.provider_permissions;
-        //   web_session_state.provider_membership  = user_state.provider_membership;
-        // }
-        // if ( authClientEnabled && web_session_state.authenticated === 'true' ) {
-        //   user_state.provider_permissions = web_session_state.provider_permissions;
-        //   user_state.provider_membership  = web_session_state.provider_membership;
-        // }  
-
         if ( authClientEnabled ) {
-
           user_state.authenticated = userAuthenticated;
 
           if ( userAuthenticated ) { 
@@ -970,53 +959,61 @@ var j1 = function () {
         web_session_state.requested_page   = window.location.pathname;
         web_session_state.cookies_accepted = user_state.cookies_accepted; 
         j1.setWebSessionCookie( web_session_state );
+
+        json_data = JSON.stringify( web_session_state, null, 2 ); // JSON pretty print
+        logText = 'Web Session data: ' + json_data;
+        logger.info(logText);
       }
 
       j1.setUserStateCookie( user_state );
-
       json_data = JSON.stringify( user_state, undefined, 2); // JSON pretty print
       logText = 'User State data: ' + json_data;
       logger.info(logText);
       
-      json_data = JSON.stringify( web_session_state, null, 2 ); // JSON pretty print
-      logText = 'Web Session data: ' + json_data;
-      logger.info(logText);
-
-      return;
-     
-    }, // END j1.updateCookies
+      return;     
+    }, // END updateCookies
 
     // -------------------------------------------------------------------------
     // updateSidebar
     //
     // Note:
     // -------------------------------------------------------------------------
-    updateSidebar: function ( data ) {
-      var user_state = data;
+    updateSidebar: function () {
+
+      var user_state = j1.getUserStateCookie();
       var json_data;
-      var logger;
       var logText;
 
       logger = log4javascript.getLogger('j1.updateSidebar');
 
-        var pageLoaded = setInterval(function() {
-          if ( j1.state() === 'finished' ) {
-          //if ( j1.cookieConsent.state() === 'finished' ) {
-            // Replace Macro placeholders to values
-            j1.resolveMacros( user_state );
-            // Replace Macro values only
-            j1.updateMacros( user_state );
+      json_data = JSON.stringify( user_state, undefined, 2); // JSON pretty print
+      logText = 'User State data: ' + json_data;
+      logger.info(logText);
+
+      // var pageLoaded = setInterval(function() {
+      //   if ( j1.state() === 'finished' ) {
+      //   //if ( j1.cookieConsent.state() === 'finished' ) {
+      //     // Replace Macro placeholders to values
+      //     j1.resolveMacros( user_state );
+      //     // Replace Macro values only
+      //     j1.updateMacros( user_state );
+      // 
+      //     // clear interval checking
+      //     clearInterval(pageLoaded);
+      //   } // END Replace Macro placeholders
+      // }, 50); // END setInterval
+
+      // Replace Macro placeholders to values
+      j1.resolveMacros( user_state );
+      // Replace Macro values only
+      j1.updateMacros( user_state );
 
-            // clear interval checking
-            clearInterval(pageLoaded);
-          } // END Replace Macro placeholders
-        }, 50); // END setInterval
 
       return;
     } // END updateSidebar
 
   } // END j1 (return)
-}();
+}(j1, window);
 
 {% endcapture %}