j1-template 2023.2.7 → 2023.3.1

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

@@ -45,10 +45,14 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign themer_defaults   = modules.defaults.themer.defaults %}
 {% assign themer_settings   = modules.themer.settings %}
+{% assign footer_defaults   = blocks.defaults.footer.defaults %}
+{% assign footer_settings   = blocks.footer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign themer_options    = themer_defaults| merge: themer_settings %}
+{% assign footer_options    = footer_defaults | merge: footer_settings %}
+{% assign footer_id         = footer_options.active_footer %}
 {% assign default_theme     = template_config.theme %}
 {% assign theme_base        = "core/css/themes" %}
 
@@ -65,7 +69,6 @@ regenerate:                             true
   {% assign production = true %}
 {% endif %}
 
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/themer.js
@@ -105,6 +108,7 @@ j1.adapter.themer = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment               = '{{environment}}';
+  var development               = (environment.includes('dev') ? true : false);
   var url                       = new liteURL(window.location.href);
   var secure                    = (url.protocol.includes('https')) ? true : false;
   var user_state                = {};
@@ -205,11 +209,19 @@ j1.adapter.themer = (function (j1, window) {
 
       // initialize state flag
       _this.state = 'started';
-      logger.debug('\n' + 'state: ' + _this.getState());
+      if (development) {
+        logger.debug('\n' + 'state: ' + _this.getState());
+      }
 
-      // hide page (until theme is loaded)
+      // hide page until 'theme' is loaded
       $('#no_flicker').hide();
 
+      // jadams, 2023-06-10: Added to optimze 'CLS' of a page load.
+      // Find conterpart (show) in the j1.adapter
+      // hide content|footer until 'page' is loaded
+      $('#content').hide();
+      $('{{footer_id}}').hide();
+
       // jadams, 2021-07-25: problem seems NOT an timing issue on the iPad
       // platform. (General) Dependency should be REMOVED!!!
       // TODO: Isolate redirect for iPad ONLY!!!
@@ -226,7 +238,9 @@ j1.adapter.themer = (function (j1, window) {
            user_state   = j1.readCookie(cookie_names.user_state);
            user_consent = j1.readCookie(cookie_names.user_consent);
 
-           logger.debug('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
+           if (development) {
+             logger.debug('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
+           }
 
            // initial theme data
            if (user_state.theme_css === '') {
@@ -243,7 +257,9 @@ j1.adapter.themer = (function (j1, window) {
              });
 
              if (!cookie_written) {
-               logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+               if (development) {
+                 logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+               }
              }
            }
 
@@ -251,8 +267,10 @@ j1.adapter.themer = (function (j1, window) {
            user_state.theme_switcher = themerOptions.enabled;
            if (themerOptions.enabled) {
              // enable BS ThemeSwitcher
-             logger.info('\n' + 'themes detected as: ' + themerOptions.enabled);
-             logger.info('\n' + 'remote themes are being initialized');
+             if (development) {
+               logger.info('\n' + 'themes detected as: ' + themerOptions.enabled);
+               logger.info('\n' + 'remote themes are being initialized');
+             }
 
              /* eslint-disable */
              // load list of remote themes
@@ -277,8 +295,10 @@ j1.adapter.themer = (function (j1, window) {
              };
              /* eslint-enable */
            } else {
-             logger.warn('\n' + 'themes detected as: disabled');
-             logger.warn('\n' + 'no remote themes are available');
+             if (development) {
+               logger.warn('\n' + 'themes detected as: disabled');
+               logger.warn('\n' + 'no remote themes are available');
+             }
           }
 
           // validate theme to be loaded
@@ -292,13 +312,20 @@ j1.adapter.themer = (function (j1, window) {
                    $('head').append(theme_css_html);
                    clearInterval(dependencies_met_theme_loaded);
                  }
-               }, 25); // END dependencies_met_theme_loaded
+               }, 10); // END dependencies_met_theme_loaded
              } else {
                // invalid theme, fallback on default
-               logger.warn('\n' + 'themes CSS invalid: ' + user_state.theme_css);
+               if (development) {
+                 logger.warn('\n' + 'themes CSS invalid: ' + user_state.theme_css);
+               }
+
                theme_css_html = '<link rel="stylesheet" id="' + id + '" href="' + default_theme_css + '" type="text/css" />';
-               logger.warn('\n' + 'set default theme :' + default_theme_name);
-               logger.debug('\n' + 'theme CSS loaded: ' + default_theme_css);
+
+               if (development) {
+                 logger.warn('\n' + 'set default theme :' + default_theme_name);
+                 logger.debug('\n' + 'theme CSS loaded: ' + default_theme_css);
+               }
+
                $('head').append(theme_css_html);
 
                // write theme defaults to cookie
@@ -324,7 +351,7 @@ j1.adapter.themer = (function (j1, window) {
            });
           clearInterval(dependencies_met_user_state_available);
         }
-      }, 25); // END dependencies_met_user_state_available
+      }, 10); // END dependencies_met_user_state_available
 
       // set final module state if theme loaded
       var dependencies_met_theme_applied = setInterval (function () {
@@ -332,19 +359,25 @@ j1.adapter.themer = (function (j1, window) {
         styleLoaded = styleSheetLoaded(user_state.theme_css);
 
         if (styleLoaded) {
-          logger.info('\n' + 'theme loaded successfully: ' + user_state.theme_name);
-          logger.debug('\n' + 'theme CSS loaded: ' + user_state.theme_css);
-          _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module initialized successfully');
-
           // show page (theme is loaded)
           $('#no_flicker').show();
 
+          if (development) {
+            logger.info('\n' + 'theme loaded successfully: ' + user_state.theme_name);
+            logger.debug('\n' + 'theme CSS loaded: ' + user_state.theme_css);
+          }
+
+          _this.setState('finished');
+
+          if (development) {
+            logger.debug('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module initialized successfully');
+          }
+
           clearInterval(dependencies_met_theme_applied);
         }
 
-      }, 25); // END dependencies_met_theme_applied
+      }, 10); // END dependencies_met_theme_applied
 
     }, // END init
 
@@ -356,13 +389,20 @@ j1.adapter.themer = (function (j1, window) {
       var json_message = JSON.stringify(message, undefined, 2);
 
       logText = '\n' + 'received message from ' + sender + ': ' + json_message;
-      logger.info(logText);
+
+      if (development) {
+        logger.info(logText);
+      }
 
       // -----------------------------------------------------------------------
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
-        logger.info('\n' + message.text);
+
+        if (development) {
+          logger.info('\n' + message.text);
+        }
+
         //
         // Place handling of other command|action here
         //

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

@@ -20,10 +20,11 @@ regenerate:                             true
  # Tocbot is licensed under under the MIT License.
  # For details, see https://tscanlin.github.io/tocbot
  # -----------------------------------------------------------------------------
- # TODO:
- # 2019-03-10:  Old BS Affix code is to be removed
+ # jadams, 2019-03-10:
+ # TODO: Old BS Affix code is to be removed
  # -----------------------------------------------------------------------------
- # TODO:
+  # jadams, 2019-03-10:
+ # TODO: Manage heights
  #  Height of the window
  #    $(window).height()
  #  should be calculated and checked against the effective height of
@@ -166,7 +167,9 @@ j1.adapter.toccer = (function () {
           var pageVisible = (pageState == 'block') ? true: false;
           var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
 
-          if (j1.getState() == 'finished' && pageVisible && atticFinished) {
+          if (j1.getState() == 'finished' && pageVisible) {
+//        if (j1.getState() == 'finished' && pageVisible && atticFinished) {
+
             _this.initToccerCore(toccerOptions);
             _this.setState('finished');
 
@@ -175,7 +178,7 @@ j1.adapter.toccer = (function () {
             logger.debug('\n' + 'met dependencies for: j1');
             clearInterval(dependencies_met_navigator);
           }
-        }, 25);
+        }, 10);
       }
     }, // END init
 
@@ -227,7 +230,7 @@ j1.adapter.toccer = (function () {
           logger.debug('\n' + 'met dependencies for: loadHTML');
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
-      }, 25); // END dependencies_met_ajax_load_finished
+      }, 10); // END dependencies_met_ajax_load_finished
 
     }, // END initToccerCore
 

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

@@ -206,7 +206,9 @@ j1.adapter.translator = (function (j1, window) {
         var pageVisible   = (pageState == 'block') ? true: false;
         var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
 
-        if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+        if (j1.getState() === 'finished' && pageVisible) {
+//      if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
@@ -333,7 +335,7 @@ j1.adapter.translator = (function (j1, window) {
 
           clearInterval(dependencies_met_page_ready);
         }
-      }, 25);
+      }, 10);
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -61,8 +61,8 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/comments.js
- # J1 Adapter for the comments module
+ # ~/assets/themes/j1/adapter/js/waves.js
+ # J1 Adapter for the waves module
  #
  # Product/Info:
  # https://jekyll.one
@@ -149,7 +149,9 @@ var logText;
         var pageVisible   = (pageState == 'block') ? true : false;
         var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
 
-        if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+        if (j1.getState() === 'finished' && pageVisible) {
+//      if (j1.getState() === 'finished' && pageVisible && atticFinished) {
+
           themes_allowed = waveOptions.themes.toString();
           theme_enabled  = waveOptions.themes.indexOf(theme) > -1 ? true : false;
 
@@ -184,7 +186,7 @@ var logText;
 
           clearInterval(dependencies_met_page_ready);
         }
-      }, 25);
+      }, 10);
 
     }, // END init