j1_template_mde 2018.4.33 → 2018.4.34

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

@@ -94,7 +94,7 @@ j1.Scroller = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
       logger.info("SmoothScroll initialized successfully");
 
-      return;
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -94,7 +94,7 @@ j1.Searcher = (function (j1, window) {
       logger.info("Jekyll Search initialized successfully");
       logger.info('state: ' + state); // Set|Log status
 
-      return;
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -80,7 +80,7 @@ j1.Stickybits = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
       logger.info("J1 Stickybits successfully initialized");
 
-      return;
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -98,7 +98,7 @@ j1.Switcher = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
       logger.info("J1 Theme Switcher initialized successfully");
 
-      return;
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -93,7 +93,6 @@ var j1 = function () {
   var colors_data_path    = "/assets/data/colors.json";
   
   // Logger
-  var logger;
   var logText;
 
   // J1 UserState Cookie (initial values)
@@ -102,15 +101,15 @@ var j1 = function () {
     'theme_extension_css' : '/assets/themes/j1/core/css/theme_extensions.css',
     'theme_name' : 'Uno',
     'theme_author' : 'J1 Team',
-    'theme_link' : 'https://support.jekyll-one.com/',
+    'theme_link' : 'https://jekyll.one/',
     'previous_page' : 'unknown',
     'current_page' : 'unknown',
-    'provider' : 'j1',
-    'provider_membership' : 'guest',
-    "provider_permissions" : "public",
-    "provider_url" : "https:/jekyll.one", 
+    'provider' : '{{site.data.j1_config.user.provider}}',
+    'provider_membership' : '{{site.data.j1_config.user.provider_membership}}',
+    "provider_permissions" : "{{site.data.j1_config.user.provider_permissions}}",
+    "provider_url" : "{{site.data.j1_config.user.provider_url}}", 
     'status' : 'pending',
-    'user_name' : 'visitor',
+    'user_name' : '{{site.data.j1_config.user.user_name}}',
     'language' : 'unknown',
     'cookies_accepted' : "pending",
     'writer' : 'web'
@@ -120,8 +119,9 @@ var j1 = function () {
 
     // Initialize
     init: function ( options ) {
+      var logger;
 
-      var logger = log4javascript.getLogger('j1.Template.adapter');
+      logger = log4javascript.getLogger('j1.Template.init');
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
 
@@ -132,7 +132,8 @@ var j1 = function () {
       }
 
       if ( settings.scrollbar === 'false'  ) {
-        $( 'body' ).addClass( 'hide-scrollbar' )
+        $('body').addClass( 'hide-scrollbar' )
+        $('html').addClass( 'hide-scrollbar-moz' )
       }
 
       // Detect|Set J1 AppSession
@@ -176,7 +177,7 @@ var j1 = function () {
           j1.displayPage(settings);
       });
 
-      return;
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -184,12 +185,12 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initBanner: function ( options ) {
-
-      var logger        = log4javascript.getLogger('j1.Template.adapter');
       var banner        = [];
       var bannerOptions = [];
+      var logger;
 
-      var logText = 'initBanner: Start initialization';
+      logger  = log4javascript.getLogger('j1.Template.initBanner');
+      logText = 'initBanner: Start initialization';
       logger.info(logText);
 
       {% comment %} helper functions for (AJAX) data load
@@ -294,19 +295,19 @@ var j1 = function () {
         }
       }
 
-      return;
+      return true;
     }, // END initBanner
 
     // -------------------------------------------------------------------------
     // AJAX loader for panel used with J1 Template fo all pages
     // -------------------------------------------------------------------------
     // ToDo:
-    initPanel: function ( options ) {
-
-      var logger = log4javascript.getLogger('j1.Template.adapter');
-      var panel  = [];
+    initPanel: function ( options ) {    
+      var panel = [];
+      var logger;
 
-      var logText = 'initPanel: Start initialization';
+      logger = log4javascript.getLogger('j1.Template.initPanel');
+      logText = 'initPanel: Start initialization';
       logger.info(logText);
 
       // closure to pass additional data (e.g. div #id)
@@ -360,7 +361,7 @@ var j1 = function () {
         }
       }
 
-      return;
+      return true;
     }, // END initPanel
 
     // -------------------------------------------------------------------------
@@ -368,9 +369,10 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initFooter: function ( options ) {
+      var logger;
 
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
-      var logText = 'initFooter: Start initialization';
+      logger  = log4javascript.getLogger('j1.Template.initFooter');
+      logText = 'initFooter: Start initialization';
       logger.info(logText);
 
       var cb_load_closure = function(footer_id) {
@@ -396,7 +398,7 @@ var j1 = function () {
         selector.load( footer_data_path, cb_load_closure( id ) );
       }
 
-      return;
+      return true;
     }, // END initFooter
 
     // -------------------------------------------------------------------------
@@ -404,9 +406,10 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initClipboard: function ( options ) {
+      var logger;
 
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
-      var logText = 'initClipboard: Start initialization';
+      logger  = log4javascript.getLogger('j1.Template.initClipboard');
+      logText = 'initClipboard: Start initialization';
       logger.info(logText);
 
       // insert copy to clipboard button before all elements having a
@@ -450,7 +453,7 @@ var j1 = function () {
         $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
       });
 
-      return;
+      return true;
     }, // END initClipboard
 
     // -------------------------------------------------------------------------
@@ -459,16 +462,47 @@ var j1 = function () {
     // AND the menubar is signaled as (state) 'finished'
     // -------------------------------------------------------------------------
     displayPage: function ( options ) {
+      var settings          = options;
+      var user_state        = {};
+      var web_session_state = {};
+      var appDetected       = j1.Navigator.appDetected();
+      var authClientEnabled = j1.Navigator.authClientEnabled();
+      var logger;
 
-      var settings = options;
-
-      logger  = log4javascript.getLogger('j1.displayPage');
-      logText = 'Start to display the page';
+      logger  = log4javascript.getLogger('j1.Template.displayPage');
+      logText = 'Finalize current page';
       logger.info(logText);
       
       var headerLoaded = setInterval(function() {
 
         if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
+
+          user_state = j1.getUserStateCookie();
+
+          // Show or Hide cookie icon
+          if ( user_state.cookies_accepted === 'accepted' ) {
+            logText = 'Display cookie icon';
+            logger.info(logText);
+            // Display cookie icon
+            $('#quickLinksCookieButton').css('display', 'block'); 
+          } else {
+            logText = 'Hide cookie icon';
+            logger.info(logText);
+            // Display cookie icon
+            $('#quickLinksCookieButton').css('display', 'none'); 
+          }
+
+          // Show or Hide signin icon
+          if ( appDetected && authClientEnabled ) {
+            logText = 'Show signIn icon';
+            logger.info(logText);
+            $('#quickLinksSignInOutButton').css('display', 'block'); 
+          } else {
+            logText = 'Hide signIn icon';
+            logger.info(logText);
+            $('#quickLinksSignInOutButton').css('display', 'none'); 
+          }
+
           $('#no_flicker').css('display', 'block'); // display current page
           j1.scrollTo(); // scroll to an anchor element this page (if any)
 
@@ -480,7 +514,7 @@ var j1 = function () {
           state = 'finished';
           logText = 'state: ' + state;
           logger.info(logText);
-          logText = "displayPage: J1 Template successfully initialized";
+          logText = "J1 Template successfully initialized";
           logger.info(logText);
 
           // clear interval checking
@@ -488,7 +522,7 @@ var j1 = function () {
         }
       }, 50); // END setInterval
 
-      return;
+      return true;
     }, // END displayPage
 
     // -------------------------------------------------------------------------
@@ -496,9 +530,10 @@ var j1 = function () {
     // -------------------------------------------------------------------------
     // ToDo:
     initMDB: function ( options ) {
+      var logger;    
 
-      var logger  = log4javascript.getLogger('j1.Template.adapter');
-      var logText = 'initMDB: Start initMDB';
+      logger  = log4javascript.getLogger('j1.Template.initMDB');
+      logText = 'initMDB: Start initMDB';
       logger.info(logText);
 
       $('body').bootstrapMaterialDesign();
@@ -507,7 +542,7 @@ var j1 = function () {
       var logText = 'initMDB Finished initMDB';
       logger.info(logText);
 
-      return;
+      return true;
     }, // END initMDB
 
     // -------------------------------------------------------------------------
@@ -570,6 +605,39 @@ var j1 = function () {
       return decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
     }, // END getCookie
 
+    // -------------------------------------------------------------------------
+    //  Clears all given cookies by name (except cookies set to httpOnly). 
+    //  For all cookies, the expire date is set in the past to make all 
+    //  cookies affectected a 'session' cookie. All session cookies are 
+    //  deleted by the browser automatically if the last session (browser 
+    //  window) is closed.
+    //  See: https://stackoverflow.com/questions/179355/clearing-all-cookies-with-javascript
+    // -------------------------------------------------------------------------
+    deleteCookie: function (options) {
+      var name        = options;
+      var all_cookies = document.cookie.split("; ");
+
+      if ( name === 'all' ) {
+        for (var c = 0; c < all_cookies.length; c++) {
+          var d = window.location.hostname.split(".");
+          while (d.length > 0) {
+            var cookieBase = encodeURIComponent(all_cookies[c].split(";")[0].split("=")[0]) + '=; expires=Thu, 01-Jan-1970 00:00:01 GMT; domain=' + d.join('.') + ' ;path=';
+            var p = location.pathname.split('/');
+            document.cookie = cookieBase + '/';
+            while (p.length > 0) {
+              document.cookie = cookieBase + p.join('/');
+              p.pop();
+            };
+            d.shift();
+          }
+        }
+      } else {
+        document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
+      }
+
+      return true;
+    }, // END getCookie
+
     // -------------------------------------------------------------------------
     //  Returns the current user state collected from /status endpoint
     //  if the web is detected as an app
@@ -642,7 +710,7 @@ var j1 = function () {
         Cookies.set( 'j1.user.state', user_state_encoded, { expires: 365 } );
       }
 
-      return;
+      return true;
     }, // END setUserStateCookie
 
     // -------------------------------------------------------------------------
@@ -759,7 +827,7 @@ var j1 = function () {
         $(window).scrollTop($(window).scrollTop()-1);
       } // END if anchor_id
 
-      return;
+      return true;
     }, // END scrollTo
 
     // -------------------------------------------------------------------------
@@ -845,7 +913,7 @@ var j1 = function () {
         });
       }); // END Replace macros
 
-      return;
+      return true;
     }, // END resolveMacros
 
     // -------------------------------------------------------------------------
@@ -881,7 +949,7 @@ var j1 = function () {
           var $html = $this.html();                    
           //$this.html($html.replace(/all|public|protected|private/g, user_state.provider_permissions));
           //$this.html($html.replace(/.*/, 'Permissions: ' + user_state.provider_permissions));
-          $this.html($html.replace(/public.*|protected.*|private.*/, user_state.provider_permissions));
+          $this.html($html.replace(/public.*|protected.*|private.*|blocked.*/, user_state.provider_permissions));
         });
         $('#macro-provider-membership').each(function() {
           var $this = $(this);
@@ -890,7 +958,7 @@ var j1 = function () {
         });
       });
 
-      return;
+      return true;
     }, // END updateMacros
 
     // -------------------------------------------------------------------------
@@ -920,17 +988,16 @@ var j1 = function () {
     //
     // -------------------------------------------------------------------------
     updateCookies: function ( data ) {
-
       var user_state        = data;
       var appDetected       = j1.Navigator.appDetected();
       var authClientEnabled = j1.Navigator.authClientEnabled();
+      var cookiesDeclined   = user_state.cookies_accepted === 'declined' ? true : false;
       var userAuthenticated;
       var web_session_state;
       var json_data;
-      var logger;
-      var logText;
+      var logger;    
 
-      logger = log4javascript.getLogger('j1.updateCookies');
+      logger = log4javascript.getLogger('j1.Template.updateCookies');
 
       // Update cookies
       if ( appDetected ) {
@@ -941,17 +1008,25 @@ var j1 = function () {
           user_state.authenticated = userAuthenticated;
 
           if ( userAuthenticated ) { 
-            user_state.provider             = web_session_state.provider;
-            user_state.user_name            = web_session_state.user_name;
-            user_state.provider_membership  = web_session_state.provider_membership;
-            user_state.provider_permissions = web_session_state.provider_permissions;
+            user_state.provider               = web_session_state.provider;
+            user_state.user_name              = web_session_state.user_name;
+            user_state.provider_membership    = web_session_state.provider_membership;
+            if ( cookiesDeclined ) {
+              user_state.provider_permissions = 'blocked';
+            } else {
+              user_state.provider_permissions = web_session_state.provider_permissions;
+            }
           } else {
-            // Set default credentials if soignet out
-            user_state.provider             = 'j1'
-            user_state.user_name            = 'vistor';
-            user_state.status               = 'active';
-            user_state.provider_membership  = 'guest';
-            user_state.provider_permissions = 'public'
+            // Set default credentials if user is signed out
+            user_state.provider               = '{{site.data.j1_config.user.provider}}';
+            user_state.user_name              = '{{site.data.j1_config.user.user_name}}';
+            user_state.status                 = 'active';
+            user_state.provider_membership    = '{{site.data.j1_config.user.provider_membership}}';
+            if ( cookiesDeclined ) {
+              user_state.provider_permissions = 'blocked';
+            } else {
+              user_state.provider_permissions = '{{site.data.j1_config.user.provider_permissions}}';
+            }                        
           }
         }
 
@@ -970,7 +1045,7 @@ var j1 = function () {
       logText = 'User State data: ' + json_data;
       logger.info(logText);
       
-      return;     
+      return true;     
     }, // END updateCookies
 
     // -------------------------------------------------------------------------
@@ -979,37 +1054,33 @@ var j1 = function () {
     // Note:
     // -------------------------------------------------------------------------
     updateSidebar: function () {
-
       var user_state = j1.getUserStateCookie();
       var json_data;
-      var logText;
-
-      logger = log4javascript.getLogger('j1.updateSidebar');
+      var logger;     
+
+      logger = log4javascript.getLogger('j1.Template.updateSidebar');
+
+      if (!user_state) {
+        user_state                      = {};
+        user_state.status               = 'pending';
+        user_state.user_name            = '{{site.data.j1_config.user.user_name}}';
+        user_state.provider             = '{{site.data.j1_config.user.provider}}';
+        user_state.provider_url         = '{{site.data.j1_config.user.provider_url}}';        
+        user_state.provider_membership  = '{{site.data.j1_config.user.provider_membership}}';
+        user_state.provider_permissions = 'blocked';
+        
+      }
 
       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 );
 
-
-      return;
+      return true;
     } // END updateSidebar
 
   } // END j1 (return)