j1_template_mde 2018.4.32 → 2018.4.33

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

@@ -109,12 +109,15 @@ j1.cookieConsent = (function (j1, window) {
           });
           j1.cookieConsent.modalEventHandler( consentConfig );
       });
+
+      return;
     }, // END init cookieConsent
 
     // -------------------------------------------------------------------------
     // load the modals used by cookieConsent
     // -------------------------------------------------------------------------
     loadModals: function ( consentConfig ) {
+
       // closure to pass additional data (#id)
       var cb_load_closure = function( id ) {
         return function ( responseTxt, statusTxt, xhr ) {
@@ -146,6 +149,8 @@ j1.cookieConsent = (function (j1, window) {
         state = 'finished';
         logger.info('state: ' + state);
       }
+
+      return;
     }, // END loadModals
 
     // -------------------------------------------------------------------------
@@ -153,7 +158,7 @@ j1.cookieConsent = (function (j1, window) {
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    },
+    }, // END state
 
     // -------------------------------------------------------------------------
     // EventHandler for J1 Cookie Consent
@@ -161,6 +166,7 @@ j1.cookieConsent = (function (j1, window) {
     // See: https://www.nickang.com/add-event-listener-for-loop-problem-in-javascript/
     // -------------------------------------------------------------------------
     modalEventHandler: function ( options ) {
+
       var consentConfig = options;
       var logText;
 
@@ -215,15 +221,13 @@ j1.cookieConsent = (function (j1, window) {
                   user_state.provider_membership  = 'guest';  //default
                   user_state.provider_permissions = 'public'; //default
 
-                  // Update cookies|sidebar
+                  // Update cookies
                   j1.updateCookies( user_state );
-            	    j1.updateSidebar( user_state );
+                  
+                  // Display cookie icon
+                  $('#quickLinksCookieButton').css('display', 'block'); 
 
-                  $('#quickLinksCookieButton').css('display', 'block'); // display cookie icon
                   return;
-
-                  // current_page = window.location.pathname;
-                  // window.location.href = current_page;
                 }
                 // declineButton
                 // -------------------------------------------------------------
@@ -238,9 +242,8 @@ j1.cookieConsent = (function (j1, window) {
                   user_state.cookies_accepted     = 'declined';                  
                   user_state.provider_permissions = 'public';
 
-                  // Update cookies|sidebar
+                  // Update cookies
                   j1.updateCookies( user_state );
-            	    j1.updateSidebar( user_state );
 
                   $('#quickLinksCookieButton').css('display', 'none');
                   // Set route to home page if current page is NOT whitelisted
@@ -270,11 +273,12 @@ j1.cookieConsent = (function (j1, window) {
                   user_state.cookies_accepted     = 'declined';
                   user_state.provider_permissions = 'public';
 
-                  // Update cookies|sidebar
+                  // Update cookies
                   j1.updateCookies( user_state );
-            	    j1.updateSidebar( user_state );
 
+                  // Hide cookie icon
                   $('#quickLinksCookieButton').css('display', 'none');
+
                   // Set route to home page if current page is NOT whitelisted
                   if ( !whitelisted ) { window.location.href = '/'; }
                 }
@@ -292,7 +296,7 @@ j1.cookieConsent = (function (j1, window) {
           // -------------------------------------------------------------------
           $(document).on('hide.bs.modal','#topFullCookieConsent', function () {
             logger.info('User closed topFullCookieConsent');
-
+    
             appDetected       = j1.Navigator.appDetected();
             authClientEnabled = j1.Navigator.authClientEnabled();
 
@@ -303,10 +307,10 @@ j1.cookieConsent = (function (j1, window) {
               $('#quickLinksSignInOutButton').css('display', 'none'); 
             }
 
-            // Load current cookie data
-            // user_state  = j1.getUserStateCookie();
-            // if ( appDetected ) { web_session_state = j1.getWebSessionCookie(); }
-            
+            // Update sidebar
+            logger.info('Update sidebar');
+      	    j1.updateSidebar();
+
             $('body').removeClass('stop-scrolling');
           });
 
@@ -323,17 +327,22 @@ j1.cookieConsent = (function (j1, window) {
               $('#quickLinksSignInOutButton').css('display', 'block'); 
             } else {
               $('#quickLinksSignInOutButton').css('display', 'none'); 
-            }            
+            }
           });
+
+          // Update sidebar
+          logger.info('Update sidebar');
+    	    j1.updateSidebar();
+
           // clear interval checking
           clearInterval(modalsLoaded);
-
         } // END Manage cookie consent dialog
       }, 50); // END setInterval
 
       logText = "modalEventHandler: EventHandler initialized";
       logger.info(logText);
 
+      return;
     } // END modalEventHandler
 
   }; // END return

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

@@ -53,12 +53,14 @@ regenerate:                             false
 {% assign config = site.data.modules.YOUR_DATA.yml %}
 
 j1.YOUR_ADAPTER = (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
@@ -73,17 +75,18 @@ j1.YOUR_ADAPTER = (function (j1, window) {
       state = 'finished';
       logger.info('state: ' + state); // Set|Log status
       logger.info("J1 Custom JS module successfully initialized");
-    }, // end init
+
+      return;
+    }, // END init
 
     // -------------------------------------------------------------------------
     //  returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     state: function () {
       return state;
+    } // END state
 
-    } // end state
-  }; // end return
-
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

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

@@ -87,10 +87,12 @@ regenerate:                             false
         tolerance:                {{config.tolerance | json }},
         widthCalculationMethod:   {{config.widthCalculationMethod | json }},
         targetOrigin:             this.settings.checkOrigin
-    });
-    } // end init
-  }; // end return
+      });
 
+      return;
+    } // END init
+
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

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

@@ -84,9 +84,10 @@ j1.Lightbox = (function (j1, window) {
       var log_text = 'Lightbox initialized successfully'
       logger.info(log_text);
 
-    } // end init lightbox
-  }; // end return
+      return;
+    } // END init lightbox
 
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

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

@@ -54,8 +54,9 @@ regenerate:                         true
 --------------------------------------------------------------- {% endcomment %}
 
 j1.Logger = (function (j1, window) {
+
   var environment = '{{environment}}'; // Set environment
-  var state       = 'unknown';
+  var state       = 'not_started';
   var logger;
   var logText;
 
@@ -142,9 +143,10 @@ j1.Logger = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
       logger.info('Logger Framework successfully initialized');
 
-    } // end init
-  }; // end return
+      return;
+    } // END init
 
+  }; // END return
 })(j1, window);
 
 {% endcapture %}

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

@@ -62,8 +62,9 @@ regenerate:                             true
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 j1.MastHead = (function (j1, window) {
+
   var environment = '{{environment}}'; // Set environment
-  var state       = 'unknown';
+  var state       = 'not_started';
   var logger;
   var logText;
 
@@ -133,7 +134,9 @@ j1.MastHead = (function (j1, window) {
           logger.info('state: ' + state); // Set|Log status
           j1.MastHead.loadHeader( frontmatterOptions, j1_colors, j1_font_sizes );
       });
-    }, // end init
+
+      return;
+    }, // END init
 
     // -------------------------------------------------------------------------
     // Initialize all header supported
@@ -234,7 +237,7 @@ j1.MastHead = (function (j1, window) {
               });
             {% endif %}
 
-          } // endif header_id exists
+          } // ENDif header_id exists
 
           // Initialize the header found in page
           if ( $('#{{ header_id }}').length ) {
@@ -353,8 +356,8 @@ j1.MastHead = (function (j1, window) {
                 var imageHeaderOptions = j1.mergeData( image_header_defaults, imageHeaderOptions );
               {% else %}
                 {% continue %}
-              {% endif %} // endif header_id
-            {% endfor %} // endfor item in header_config.headers
+              {% endif %} // ENDif header_id
+            {% endfor %} // ENDfor item in header_config.headers
 
             {% comment %} frontmatter takes precedence (over header options)
             -------------------------------------------------------------------- {% endcomment %}
@@ -462,21 +465,23 @@ j1.MastHead = (function (j1, window) {
                   state = 'completed';
                   logger.info('state: ' + state); // Set|Log status
                 }
-              }, 50); // end setInterval
+              }, 50); // END setInterval
             }
-          } // endif header id found in page
-        {% endif %} // endif header enabled
-      {% endfor %} // endfor item in header_config.headers
-    }, // end function loadHeader
+          } // END if header id found in page
+        {% endif %} // END if header enabled
+      {% endfor %} // END for item in header_config.headers
+
+      return;
+    }, // END loadHeader
 
     // -------------------------------------------------------------------------
     //  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/navigator.js

@@ -91,10 +91,6 @@ j1.Navigator = (function (j1, window) {
   var font_size_data_path         = "/assets/data/font_sizes.json";
   var nav_menu_data_path          = "/assets/data/menu/index.html"
   var authclient_modals_data_path = "/assets/data/authclient/index.html"
-  //var web_session_state         = j1.getWebSessionCookie();
-  // var web_session_state_empty  = jQuery.isEmptyObject(web_session_state);
-  //var user_state                = j1.getUserStateCookie();
-  //var user_state_empty          = jQuery.isEmptyObject(user_state);
   var user_state                  = {};
   var user_state_merged           = {};
   var web_session_state           = {};
@@ -228,10 +224,6 @@ j1.Navigator = (function (j1, window) {
           } else {
             $('#quickLinksSignInOutButton').css('display', 'none');
           }
-
-          // Update cookies|sidebar
-          //j1.updateCookies( user_state );
-    	    //j1.updateSidebar( user_state );
         
           // Set|Log status
           state = 'initialized';
@@ -259,12 +251,14 @@ j1.Navigator = (function (j1, window) {
         $(".navbar-collapse").removeClass("bounceIn");
       });
 
+      return;
     }, // END init
 
     // -------------------------------------------------------------------------
     // load the Menu bar
     // -------------------------------------------------------------------------
     loadMenuBar: function ( navMenuOptions ) {
+
       // 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
@@ -301,12 +295,14 @@ j1.Navigator = (function (j1, window) {
         selector.load( menu_data_path, cb_load_closure( id, navMenuOptions ) );
       }
 
+      return;
     }, // END loadMenuBar
 
     // -------------------------------------------------------------------------
     // load the modals used by J1AuthClient
     // -------------------------------------------------------------------------
     loadAuthClientModals: function ( authConfig ) {
+
       // closure to pass additional data (#id)
       var cb_load_closure = function( id ) {
         return function ( responseTxt, statusTxt, xhr ) {
@@ -339,31 +335,35 @@ j1.Navigator = (function (j1, window) {
         state = 'finished';
         logger.info('state: ' + state);
       }
+
+      return;
     }, // END loadAuthClientModals
 
     // -------------------------------------------------------------------------
     // Initialize JS portion for the dialogs (modals) used by J1AuthClient
+    // NOTE: Currently cookie|sidebar updates NOT processed at the NAV module
+    //       All updates on Cookies are managed by Cookie Consent.
+    //       To be considered to re-add cookie updates for the auth state
     // -------------------------------------------------------------------------
-    initAuthClient: function( authConfig  ) {
+    initAuthClient: function( options ) {
+      
+      var authConfig        = options;
       var web_session_state = j1.getWebSessionCookie();
-      var updateUserState   = authConfig.update_user_state;
-      var userAuthenticated;
-      var logger;
-      var logText;
+      var userAuthenticated = web_session_state.authenticated === 'true' ? true : false;
 
-      logger  = log4javascript.getLogger('j1.AuthClient'); // Setup logger
+      // Setup logger
+      logger  = log4javascript.getLogger('j1.initAuthClient');
       state   = 'initialize';
       logText = 'state: ' + state;
       logger.info(logText);
 
       j1.Navigator.modalEventHandler( authConfig );
 
-      // if ( web_session_state != null  && authConfig.enabled === true ) {
       if ( j1.Navigator.appDetected() && j1.Navigator.authClientEnabled() ) {
 
-        user_state        = j1.getUserStateCookie();
-        web_session_state = j1.getWebSessionCookie(); 
-        userAuthenticated = web_session_state.authenticated === 'true' ? true : false;
+        // user_state        = j1.getUserStateCookie();
+        // web_session_state = j1.getWebSessionCookie(); 
+        // userAuthenticated = web_session_state.authenticated === 'true' ? true : false;
 
         // Toggle/Set SignIn/SignOut icon|link in QuickLinks
         // See: https://stackoverflow.com/questions/13524107/how-to-set-data-attributes-in-html-elements
@@ -380,12 +380,9 @@ j1.Navigator = (function (j1, window) {
           $('#navLinkSignInOut').attr("data-target","#modalOmniSignIn");
           $('#iconSignInOut').removeClass( "mdi-logout" ).addClass( "mdi-login" );
         }
-
-        if ( updateUserState ) {
-          // Update cookies|sidebar
-          j1.updateCookies( user_state );
-    	    j1.updateSidebar( user_state );
-        }
+        // logger.info('Update cookies|sidebar');
+        // j1.updateCookies( user_state );
+    	  // j1.updateSidebar( user_state );
       } 
 
       // Set|Log status
@@ -393,6 +390,7 @@ j1.Navigator = (function (j1, window) {
       logText = 'state: ' + state;
       logger.info(logText);
 
+      return;
     }, // END initAuthClient
 
     // -------------------------------------------------------------------------
@@ -401,6 +399,7 @@ j1.Navigator = (function (j1, window) {
     // See: https://www.nickang.com/add-event-listener-for-loop-problem-in-javascript/
     // -------------------------------------------------------------------------
     modalEventHandler: function ( options ) {
+
       var authConfig = options;
       var route;
       var provider;
@@ -524,6 +523,7 @@ j1.Navigator = (function (j1, window) {
         } // END Manage cookie consent dialog
       }, 50); // END setInterval
 
+      return;
     }, // END modalEventHandler
 
     // -------------------------------------------------------------------------
@@ -665,6 +665,7 @@ j1.Navigator = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       $('head').append("<style>.side { background-color: " +navSidebarOptions.background_color+ "; }</style>");
 
+      return;
     }, // END setCss
 
     // -------------------------------------------------------------------------
@@ -672,13 +673,14 @@ j1.Navigator = (function (j1, window) {
     // -------------------------------------------------------------------------
     state: function () {
       return state;
-    },
+    }, // END state
 
     // -------------------------------------------------------------------------
     //  delay all dropdown menu to open for "delay" time
     //  http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
     delayMenushow: function () {
+
       var theTimer = 0;
       var theElement = null;
 
@@ -719,12 +721,15 @@ j1.Navigator = (function (j1, window) {
             //window.clearTimeout(theTimer);
           }, {{menuOpenDelay}});
         });
+
+        return;
     }, // END delayMenushow
 
     // -------------------------------------------------------------------------
     //  returns the state of the authClient
     // -------------------------------------------------------------------------
     authClientEnabled: function () {
+
       var authClientEnabled     = {{site.j1_auth.enabled}};
       var hideOnCookiesDeclined = {{site.data.modules.j1_navigator.nav_authclient.hide_on_cookies_declined}};
       var user_state            = j1.getUserStateCookie();
@@ -740,6 +745,8 @@ j1.Navigator = (function (j1, window) {
           return true;
         }
       }
+
+      return;
     }, // END authClientEnabled
 
     // -------------------------------------------------------------------------
@@ -747,6 +754,7 @@ j1.Navigator = (function (j1, window) {
     // -------------------------------------------------------------------------
     appDetected: function () {
       var webSessionCookie = 'j1.web.session';
+
       return j1.existsCookie ( webSessionCookie );
     } // END appDetected