j1-template 2023.2.6 → 2023.3.0

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
@@ -207,9 +210,15 @@ j1.adapter.themer = (function (j1, window) {
       _this.state = 'started';
       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!!!
@@ -292,7 +301,7 @@ 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);
@@ -324,7 +333,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 +341,19 @@ j1.adapter.themer = (function (j1, window) {
         styleLoaded = styleSheetLoaded(user_state.theme_css);
 
         if (styleLoaded) {
+          // show page (theme is loaded)
+          $('#no_flicker').show();
+
           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();
-
           clearInterval(dependencies_met_theme_applied);
         }
 
-      }, 25); // END dependencies_met_theme_applied
+      }, 10); // END dependencies_met_theme_applied
 
     }, // END init
 

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