j1-template 2020.0.5 → 2020.0.6

data/lib/starter_web/_data/template_settings.yml

@@ -118,7 +118,7 @@ cookies:
   user_session:                         j1.user.session
   user_state:                           j1.user.state
 
-    
+
 # ==============================================================================
 # PAGE configuration settings
 #
@@ -132,14 +132,14 @@ cookies:
 #
 #   prettify
 #   ----------------------------------------------------------------------------
-#   If set to true, all generated HTML pages (by Liquid|Jekyll) get 
+#   If set to true, all generated HTML pages (by Liquid|Jekyll) get
 #   formatted "pretty" by layout "default".
 #
 #   NOTE: Used for developent mode ONLY
 #   NOTE: See ~/packages/300_template_src/_layouts/default.html
 #
 # ------------------------------------------------------------------------------
-flicker_timeout:                        250
+flicker_timeout:                        150
 
 # ------------------------------------------------------------------------------
 # HTML PrettyPrint
@@ -159,9 +159,9 @@ user:
   provider:                             j1
   provider_site_url:                    https://jekyll.one
   provider_home_url:                    https://jekyll.one
-  provider_blog_url:                    /pages/public/blog/navigator/ 
+  provider_blog_url:                    /pages/public/blog/navigator/
   provider_member_url:                  /pages/public/learn/whats_up/
-  provider_privacy_url:                 /pages/public/legal/en/privacy/                       
+  provider_privacy_url:                 /pages/public/legal/en/privacy/
   user_name:                            guest
   status:                               active
   provider_membership:                  guest
@@ -191,7 +191,7 @@ fa:
 # Body style settings
 #
 body:
-  scrollbar:                            false 
+  scrollbar:                            false
   background-color:                     md_gray_50
   font-color:                           md_gray_900
   font-size:                            1em
@@ -219,7 +219,7 @@ comments:
   enabled:                              true
   provider:                             disqus
 
-  disqus:    
+  disqus:
     short_name:                         jekyll-one
 
 # facebook:
@@ -228,7 +228,7 @@ comments:
 #   width:                              580
 #   colorscheme:                        light
 
-# custom:    
+# custom:
 #   custom_data:
 
 # ------------------------------------------------------------------------------
@@ -242,7 +242,7 @@ analytics:
   provider:                             google
   google:
     tracking_id:                        'UA-138160879-1'
-  custom:    
+  custom:
     custom_data:
 
 # ------------------------------------------------------------------------------
@@ -254,9 +254,9 @@ analytics:
 advertising:
   enabled:                              false
   provider:                             google
-  google:    
+  google:
     publisher_id:                       ca-pub-6537273267695855
-  custom:    
+  custom:
     custom_data:
 
 # ------------------------------------------------------------------------------
@@ -271,7 +271,7 @@ translation:
 
   google:
     layout:                             default
-    meta_data:                          [google-translate-customization]    
+    meta_data:                          [google-translate-customization]
     page_language:                      en
     translation_languages:              [all]
 
@@ -291,4 +291,4 @@ translation:
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_plugins/uglify.rb

@@ -0,0 +1,41 @@
+# ------------------------------------------------------------------------------
+# ~/_plugins/uglify.rb
+# Liquid filter for J1 Template to uglify JS
+#
+# Product/Info:
+# http://jekyll.one
+#
+# Copyright (C) 2020 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+# => Uglifier.compile(File.read(input))
+# ------------------------------------------------------------------------------
+#
+#  NOTE:
+#  CustomFilters cannot be used in SAFE mode (e.g not usable for
+#  rendering pages with Jekyll on GitHub
+#
+#  USAGE:
+#    {% capture cache_name %}
+#
+#      liquid code to generate HTML output goes here
+#
+#    {% endcapture %}
+#    {{ cache_name | uglify }}
+#
+# ------------------------------------------------------------------------------
+require 'uglifier'
+
+module Jekyll
+  module UglifyJS
+    def uglify(input)
+      site_config = @context.scopes[0]["site_config"]
+      path = @context.registers[:page]["url"]
+      Uglifier.compile(File.read("X:/j1/github/j1-template/packages/400_template_site/_site/assets/themes/j1/adapter/js/toccer.js"))
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::UglifyJS)

data/lib/starter_web/assets/themes/j1/adapter/js/algolia.js

@@ -302,7 +302,7 @@ j1.adapter['algolia'] = (function (j1, window) {
     // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.scroller.state = stat;
+      j1.adapter.algolia.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
@@ -310,7 +310,7 @@ j1.adapter['algolia'] = (function (j1, window) {
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.scroller.state;
+      return j1.adapter.algolia.state;
     } // END state
 
   }; // END return
@@ -318,4 +318,4 @@ j1.adapter['algolia'] = (function (j1, window) {
 
 {% endcapture %}
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/lib/starter_web/assets/themes/j1/adapter/js/attic.js

@@ -120,7 +120,7 @@ j1.adapter['attic'] = (function (j1, window) {
           // clear interval checking
           clearInterval(dependencies_met_attic_adapter);
         }
-      }, 50); // END 'dataLoaded'
+      }, 25); // END 'dataLoaded'
 
       return true;
     }, // END init
@@ -544,7 +544,7 @@ j1.adapter['attic'] = (function (j1, window) {
     // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.scroller.state = stat;
+      j1.adapter.attic.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
@@ -552,7 +552,7 @@ j1.adapter['attic'] = (function (j1, window) {
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.scroller.state;
+      return j1.adapter.attic.state;
     } // END state
 
   }; // END return
@@ -560,4 +560,4 @@ j1.adapter['attic'] = (function (j1, window) {
 
 {% endcapture %}
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/lib/starter_web/assets/themes/j1/adapter/js/carousel.js

@@ -293,7 +293,7 @@ j1.adapter['carousel'] = (function (j1, window) {
     // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.scroller.state = stat;
+      j1.adapter.carousel.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
@@ -301,7 +301,7 @@ j1.adapter['carousel'] = (function (j1, window) {
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.scroller.state;
+      return j1.adapter.carousel.state;
     } // END state
 
   }; // END return
@@ -310,4 +310,4 @@ j1.adapter['carousel'] = (function (j1, window) {
 
 {% endcapture %}
 {{cache | strip_empty_lines}}
-{% assign cache = nil %}
+{% assign cache = nil %}

data/lib/starter_web/assets/themes/j1/adapter/js/framer.js

@@ -189,7 +189,7 @@ j1.adapter['framer'] = (function (j1, window) {
     // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.scroller.state = stat;
+      j1.adapter.framer.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
@@ -197,7 +197,7 @@ j1.adapter['framer'] = (function (j1, window) {
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.scroller.state;
+      return j1.adapter.framer.state;
     } // END state
 
   }; // END return
@@ -205,4 +205,4 @@ j1.adapter['framer'] = (function (j1, window) {
 
 {% endcapture %}
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}

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

@@ -1064,8 +1064,6 @@ var j1 = (function () {
 
       var logText = 'initializing material design finished';
       logger.info(logText);
-
-      return true;
     }, // END initMDB
 
     // -------------------------------------------------------------------------
@@ -1085,7 +1083,6 @@ var j1 = (function () {
           o[p] = a[i][p];
         }
       }
-
       return o;
     },  // END mergeData
 
@@ -1103,61 +1100,41 @@ var j1 = (function () {
     // -------------------------------------------------------------------------
     getLanguage: function () {
       var language = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage);
-
-      return language;
     }, // END getLanguage
 
     // -------------------------------------------------------------------------
-    //  returns the template version taken from site config ( _config.yml)
+    //  returns the template version taken from site config (_config.yml)
     // -------------------------------------------------------------------------
     getTemplateVersion: function () {
       return '{{template_version}}';
     }, // END getTemplateVersion
 
     // -------------------------------------------------------------------------
-    // Scrolls smooth to any anchor referenced by an page URL
-    // Values for delay|offset are taken from TOC module (Tocbot)
+    // Scrolls smooth to any anchor referenced by an page URL on
+    // e.g. a page reload. Values for delay|offset are taken from
+    // TOCCER module
     // -------------------------------------------------------------------------
     scrollTo: function () {
-      // Unclear why a offset correction is needed (sometimes ???)
-      var offset_correction = {{toccer_options.headingsOffset}};
-      var offset            = {{toccer_options.smoothScrollOffset}};
-      var anchor_id         = window.location.href.split("#")[1];
+      var anchor    = window.location.href.split("#")[1];
+      var anchor_id = '#' + anchor;
       var selector;
-      var heading;
-      var re;
 
       if (anchor_id) {
-        selector    = $('.' + anchor_id + ', #' + anchor_id +',[name='+anchor_id+']');
-        heading     = selector[0].nodeName;
-
         // scroll only, if an anchor is given with URL
+        selector = $(anchor_id);
         if (selector.length) {
-          var delay     = {{toccer_options.smoothScrollDuration}};
-          var scroll_to = parseInt( selector.offset().top - offset - offset_correction );
-          //var scroll_to = selector.offset().top;
-          $('html,body').animate({scrollTop: scroll_to}, delay,
-            function () {
-              // scroll the page one pixel back and forth
-              // to get the right position for the NAV Module (Tocbot)
-              $(window).scrollTop($(window).scrollTop()+1);
-              $(window).scrollTop($(window).scrollTop()-1);
+          j1.core.scrollSmooth.scroll( anchor_id, {
+            duration: {{toccer_options.scrollSmoothDuration}},
+            offset: {{toccer_options.scrollSmoothOffset}},
+            callback: null
           });
         } else {
-          // TODO: to be checked if this else is needed
-          // scroll the page one pixel back and forth
-          // to get the right position for the NAV Module (Tocbot)
+          // scroll the page one pixel back and forth (trigger)
+          // to get the right position for the Toccer
           $(window).scrollTop($(window).scrollTop()+1);
           $(window).scrollTop($(window).scrollTop()-1);
-        } // selector.length
-      } else {
-        // scroll the page one pixel back and forth
-        // to get the right position for the NAV Module (Tocbot)
-        $(window).scrollTop($(window).scrollTop()+1);
-        $(window).scrollTop($(window).scrollTop()-1);
-      } // END if anchor_id
-
-      return true;
+        } // END if anchor_id
+      }
     }, // END scrollTo
 
     // -------------------------------------------------------------------------

data/lib/starter_web/assets/themes/j1/adapter/js/mmenu.js

@@ -174,7 +174,6 @@ j1.adapter['mmenu'] = (function (j1, window) {
           j1.adapter.mmenu.mmenuLoader(navMenuOptions);
         }
       }, 25);
-
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -217,7 +216,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
           'j1.adapter.mmenu', {
           xhr_container_id: "{{menu_id}}",
           xhr_data_path:    "{{xhr_data_path}}" },
-          {% if forloop.last %}'data_loaded'{% else %}'data_loaded'{% endif %}){% if forloop.last %}{% else %},{% endif %}
+          {% if forloop.last %}'null'{% else %}'null'{% endif %}){% if forloop.last %}{% else %},{% endif %}
 
       {% endif %}
       {% capture id_list %}{{id_list}}{{menu_id}}{% if forloop.last %}{% else %},{% endif %} {% endcapture %}
@@ -226,6 +225,11 @@ j1.adapter['mmenu'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         // Initialize MMenu Navs and Drawers
         // ---------------------------------------------------------------------
+        // Make sure that Load HTML data (AJAX) is finished
+        setTimeout (function() {
+          _this.setState('data_loaded');
+        }, 300);
+
         var dependencies_met_mmenu_initialized = setInterval (function () {
           if (_this.getState() === 'data_loaded') {
             logger.info('load HTML data (AJAX): finished');
@@ -235,7 +239,15 @@ j1.adapter['mmenu'] = (function (j1, window) {
             j1.adapter.mmenu.mmenuInitializer(mmOptions);
             clearInterval(dependencies_met_mmenu_initialized);
           }
-        }); // END dependencies_met_mmenu_loaded
+        }, 25); // END dependencies_met_mmenu_loaded
+
+        var dependencies_met_all_menu_loaded = setInterval (function () {
+          if ( $('#menu_mmenu').length && $('#sidebar_mmenu').length && $('#toc_mmenu').length ) {
+            _this.setState('finished');
+            logger.info('status: ' + _this.getState());
+            clearInterval(dependencies_met_all_menu_loaded);
+          }
+        }, 25); // END dependencies_met_all_menu_loaded
       }); // END done
     }, // END dataLoader
 
@@ -314,9 +326,10 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
             clearInterval(dependencies_met_{{menu_id}}_loaded);
+            $('#{{item.menu.content.id}}').show();
             logger.info('initializing mmenu finished on id: #{{menu_id}}');
           }; // END mmenu_loaded
-        }); // END dependencies_met_mmenu_loaded
+        }, 25); // END dependencies_met_mmenu_loaded
         {% endif %} // ENDIF content_type: NAVIGATION
 
         {% if item.menu.content.type == "drawer" %}
@@ -374,12 +387,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
                 });
               });
               clearInterval(dependencies_met_{{menu_id}}_loaded);
+              $('#{{item.menu.content.id}}').show();
           }; // END if menu_loaded
-        }); // END dependencies_met_mmenu_loaded
+        }, 25); // END dependencies_met_mmenu_loaded
         logger.info('initializing mmenu finished on id: #{{menu_id}}');
         {% endif %} // ENDIF content_type: DRAWER
         } // END menus|drawers
-
       {% endif %} // ENDIF menu enabled
       {% endfor %} // ENDFOR menus
     }, // END mmenuInitializer

data/lib/starter_web/assets/themes/j1/adapter/js/navigator.js

@@ -244,6 +244,18 @@ j1.adapter['navigator'] = (function (j1, window) {
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
+      // -----------------------------------------------------------------------
+      // Load HTML data (AJAX)
+      // -----------------------------------------------------------------------
+      // jadams, 202-06-24: Promise (chain) if $.when seems NOT to work correctly.
+      // It semms a chain using .then will be a better solution to make it sure
+      // that the last Deferred set the state to 'data_loaded'.
+      // Found the final state randomly set to 'null' what prevent the module
+      // to run mmenuInitializer.
+      // Workaround: Set 'data_loaded' to be returned by all Deferred in
+      // the chain.
+      // See: https://stackoverflow.com/questions/5436327/jquery-deferreds-and-promises-then-vs-done
+      //
       // -----------------------------------------------------------------------
       // data loader
       // -----------------------------------------------------------------------
@@ -268,6 +280,12 @@ j1.adapter['navigator'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         // core initializer
         // ---------------------------------------------------------------------
+
+        // Make sure that Load HTML data (AJAX) is finished
+        // setTimeout (function() {
+        //   _this.setState('data_loaded');
+        // }, 150);
+
         var dependencies_met_navigator_core = setInterval (function () {
           if (_this.getState() === 'data_loaded') {
             _this.setState('processing');
@@ -581,14 +599,14 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator.navbar-scrolled.light { background-color: " +bg_scrolled+ " !important; } }</style>");
 
       // Menubar collapsed (mobile)
-      $('head').append('<style>.navbar-collapse.collapse.show { background-color: ' +bg_scrolled+ ' !important; }</style>');
+//    $('head').append('<style>.navbar-collapse.collapse.show { background-color: ' +bg_scrolled+ ' !important; }</style>');
 
 
       /* Navbar media-queries, LARGE Window|Desktop (>= 1024) */
       /* jadams:  Oversized menu bar fixed by: overflow: hidden */
 //    $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ " !important; overflow: hidden; } }</style>");
-      $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator { background-color: " +bg_collapsed+ " !important; overflow: hidden; } }</style>");
-      //$('head').append("<style>@media (max-width: 1023px) { row { margin-left: 0 !important; margin-right: 0 !important; } }</style>");
+//    $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ ") { nav.navbar.navigator { background-color: " +bg_collapsed+ " !important; overflow: hidden; } }</style>");
+//    $('head').append("<style>@media (max-width: 1023px) { row { margin-left: 0 !important; margin-right: 0 !important; } }</style>");
 
       {% comment %} navQuicklinks styles
       -------------------------------------------------------------------------- {% endcomment %}