j1_template 2019.4.7 → 2019.4.8

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

@@ -72,9 +72,11 @@ j1.adapter['octokit'] = (function (j1, window) {
 
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}'; // Set environment
-  var state         = 'not_started';
-  var moduleOptions = {};
+  var environment               = '{{environment}}'; // Set environment
+  var state                     = 'not_started';
+  var moduleOptions             = {};
+  var cookie_names              = j1.getCookieNames();
+  var cookie_user_session_name  = cookie_names.user_session;
   var logger;
   var logText;
   var _this;
@@ -91,65 +93,56 @@ j1.adapter['octokit'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function () {
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
+      // Set global variables
       _this   = j1.adapter.octokit;
       logger  = log4javascript.getLogger('j1.adapter.octokit');
 
-      {% comment %} Load module config from yml data
-      -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       moduleOptions = $.extend({}, {{webhook_options | replace: '=>', ':' | replace: 'nil', '""'}});
 
       if ( moduleOptions.enabled ) {
-        {% comment %} Inialize WebHooks if page (j1) is FULLY initialized
-        ------------------------------------------------------------------------ {% endcomment %}
-        var initializeWebHooks = setInterval( function() {
-
-          if ( j1.getState() === 'finished' ) {
-            //var appDetected       = j1.appDetected();
-            var appDetected       = j1.getMode() === 'app' ? true : false;
-            var authClientEnabled = j1.authClientEnabled();
-
-            {% comment %} Deferred (AJAX) data load
-            -------------------------------------------------------------------- {% endcomment %}
-            if ( (appDetected && authClientEnabled) || environment === 'development' || environment === 'test' ) {
-              logger.info('WebHooks allowed. Run initialization');
-
-              // Set|Log status
-              state = 'initialize';
-              logger.info('state: ' + state);
-              logger.info('Module is being initialized');
-
-              $.when( j1.xhrLoadData( 'j1.adapter.octokit', moduleOptions ) )
-                .done ( function ( success ) {
-                  // Loading data started successfully
-                  if (success) {
-                    logger.info('Loading data in progress');
-                  } else {
-                    logger.error('Loading data failed');
-                    state = j1.adapter.octokit.getState();
-                    logger.info('state: ' + state);
-                  }
-
-                  // Run initializers        
-                  j1.core.octokit.init( moduleOptions );
-                  j1.adapter.octokit.eventHandler( moduleOptions );
-              });
-
-            } else {
-              logger.warn('WebHooks not allowed. Check environmental settings');
-            }
+        logger.info('WebHooks enabled, run initialization');
 
+        // Initialize WebHooks if page is FULLY initialized
+        var pageLoaded = setInterval(function() {
+          if ( j1.getState() == 'finished') {
             // clear interval checking
-            clearInterval(initializeWebHooks);
-          }
-        }, 50); // END initializeWebHooks
+            clearInterval(pageLoaded);        
+
+            // Set|Log status
+            state = 'initialize';
+            logger.info('state: ' + state);
+            logger.info('Module is being initialized');
+
+            // Load webhook modals
+            $.when( j1.xhrLoadData('j1.adapter.octokit', moduleOptions))
+            .then (function (success) {
+              if (success) {
+                // Run initializers if webhook modals are LOADED
+                var dataLoaded = setInterval(function() {
+                  if ( j1.adapter.octokit.getState() == 'finished') {
+                    // clear interval checking
+                    clearInterval(dataLoaded);
+                    logger.info('Loading modal HTML data finished');
+                    // Run initializers        
+                    j1.core.octokit.init(moduleOptions);
+                    j1.adapter.octokit.eventHandler(moduleOptions);
+                  }
+                }, 25); // END 'dataLoaded'
+              } else {
+                logger.error('Loading modal HTML data failed');
+                state = j1.adapter.octokit.getState();
+                logger.info('state: ' + state);
+              }
+            });
+
+          } // END if getState 'finished'
+        }, 25); // END 'pageLoaded'
         return true;
       } else {
         logger.info('WebHooks disabled. Initialization skipped');
         return false;
-      } // END if moduleOptions.enabled
+      } // END if moduleOptions enabled
 
     }, // END init
 
@@ -166,165 +159,159 @@ j1.adapter['octokit'] = (function (j1, window) {
       logText = 'eventHandler: register events';
       logger.debug(logText);
 
-      var registerEvents = setInterval( function() {
-        if ( j1.adapter.octokit.getState() === 'finished' ) {
-          var modalButtons = document.querySelectorAll('a.btn');
-
-          // Register button click events for WebHook modals
-          // -------------------------------------------------------------------
-          modalButtons.forEach( function(button, index) {
-            button.addEventListener( 'click', function(e) {
-
-              // acceptGitPullButton
-              // ---------------------------------------------------------------
-              if (this.id === 'acceptGitPullButton') {
-                logger.info('User clicked acceptGitPullButton');
-
-                $.when( j1.xhrAPI('http://localhost:41001/git?request=pull') )
-                  .then( function ( response ) {
-                    json_message = JSON.stringify(response, undefined, 2);
-
-                    logText = 'Response received: ' + json_message;
-                    logger.info(logText);
-                  
-                    if ( response.status === 'success' ) {                
-                      $('#gitPullSuccess').find('.pull-message').html(response.response);
-                      $('#gitPullSuccess').modal('show');
-                    }
-
-                });
-
-                // false == prevent further event propagation (bubble up) 
-                // like preventDefault()                
-                return false;
-              }
+      var modalButtons = document.querySelectorAll('a.btn');
+      if (modalButtons == 0) {
+        logger.warn('eventHandler: no modal buttons found to register');
+      }
 
-              // declineGitPullButton
-              // ---------------------------------------------------------------
-              if (this.id === 'declineGitPullButton') {
-                logger.info('User clicked declineGitPullButton');
-            
-                return false;
-              }
+      // Register button click events for WebHook modals
+      // -------------------------------------------------------------------
+      modalButtons.forEach( function(button, index) {
+        button.addEventListener( 'click', function(e) {
 
-              // acceptGitPullButton
-              // ---------------------------------------------------------------
-              if (this.id === 'acceptGitPullButton') {
-                logger.info('User clicked acceptGitPullButton');
-
-                // if ( options.git.pull.enabled ) {
-                //   // Send commit message (silent mode)
-                //   // -------------------------------------------------------------
-                //   message.type    = 'command'
-                //   message.action  = 'pull'
-                //   message.text    = 'Run Git pull'
-                // 
-                //   j1.sendMessage( 'j1.adapter.octokit', 'j1.core.octokit', message );
-                // }
-
-                return false;
-              };
-
-              // requestFailedOkButton
-              // ---------------------------------------------------------------
-              if (this.id === 'requestFailedOkButton') {
-                logger.info('User clicked requestFailedOkButton');
-
-                return false;
-              }
+          // acceptGitPullButton
+          // ---------------------------------------------------------------
+          if (this.id === 'acceptGitPullButton') {
+            logger.info('User clicked acceptGitPullButton');
 
-            });
-          });
-
-
-          // Register pre/post events for modal 'webhookCommitDetected'
-          // -------------------------------------------------------------------
-          $(document).on('shown.bs.modal','#webhookCommitDetected',
-            function (e) {
-              logger.info('Display webhookCommitDetected');
-
-              // Autohide modal if configured
-              if ( options.commit_detection.modal_commit_detected.autohide) {
-                var modalTimeOut = setInterval(function() {
-                  $('#webhookCommitDetected').modal('hide');
-                  logger.info('Hide modal on timeout');
-                  // clear interval checking
-                  clearInterval(modalTimeOut);
-                }, options.commit_detection.modal_commit_detected.autohidden);
-              }
+            $.when( j1.xhrAPI('http://localhost:41001/git?request=pull') )
+              .then( function ( response ) {
+                json_message = JSON.stringify(response, undefined, 2);
 
-          }); // END shown modal 'webhookCommitDetected'
+                logText = 'Response received: ' + json_message;
+                logger.info(logText);
+              
+                if ( response.status === 'success' ) {                
+                  $('#gitPullSuccess').find('.pull-message').html(response.response);
+                  $('#gitPullSuccess').modal('show');
+                }
 
-          $(document).on('hide.bs.modal','#webhookCommitDetected',
-            function (e) {
-              logger.info('Closed webhookCommitDetected');
-          }); // END hide modal 'webhookCommitDetected'
+            });
 
+            // false == prevent further event propagation (bubble up) 
+            // like preventDefault()                
+            return false;
+          }
 
-          // Register pre/post events for modal 'gitPullSuccess'
-          // -------------------------------------------------------------------
-          $(document).on('shown.bs.modal','#gitPullSuccess', 
-            function () {
-              logger.info('Display gitPullSuccess');
+          // declineGitPullButton
+          // ---------------------------------------------------------------
+          if (this.id === 'declineGitPullButton') {
+            logger.info('User clicked declineGitPullButton');
+        
+            return false;
+          }
 
-              // Autohide modal if configured
-              if ( options.commit_detection.modal_pull_response.autohide) {
-                var modalTimeOut = setInterval(function() {
-                  $('#gitPullSuccess').modal('hide');
-                  logger.info('Hide modal on timeout');
-                  // clear interval checking
-                  clearInterval(modalTimeOut);
-                }, options.commit_detection.modal_pull_response.autohidden);
-              }
+          // acceptGitPullButton
+          // ---------------------------------------------------------------
+          if (this.id === 'acceptGitPullButton') {
+            logger.info('User clicked acceptGitPullButton');
+
+            // if ( options.git.pull.enabled ) {
+            //   // Send commit message (silent mode)
+            //   // -------------------------------------------------------------
+            //   message.type    = 'command'
+            //   message.action  = 'pull'
+            //   message.text    = 'Run Git pull'
+            // 
+            //   j1.sendMessage( 'j1.adapter.octokit', 'j1.core.octokit', message );
+            // }
+
+            return false;
+          };
+
+          // requestFailedOkButton
+          // ---------------------------------------------------------------
+          if (this.id === 'requestFailedOkButton') {
+            logger.info('User clicked requestFailedOkButton');
+
+            return false;
+          }
 
-          }); // END shown modal 'gitPullSuccess'
+        });
+      });
+
+      // Register pre/post events for modal 'webhookCommitDetected'
+      // -------------------------------------------------------------------
+      $(document).on('shown.bs.modal','#webhookCommitDetected',
+        function (e) {
+          logger.info('Display webhookCommitDetected');
+
+          // Autohide modal if configured
+          if ( options.commit_detection.modal_commit_detected.autohide) {
+            var modalTimeOut = setInterval(function() {
+              $('#webhookCommitDetected').modal('hide');
+              logger.info('Hide modal on timeout');
+              // clear interval checking
+              clearInterval(modalTimeOut);
+            }, options.commit_detection.modal_commit_detected.autohidden);
+          }
 
-          $(document).on('hidden.bs.modal','#gitPullSuccess', 
-            function () {    
-                          
-              logger.info('Post processing on gitPullSuccess');
-
-              if ( options.utility_server.npm_client.enabled ) {
-                if ( options.utility_server.npm_client.built.execute ) {
-                // Send commit message (silent mode)
-                // -------------------------------------------------------------
-                message.type    = 'command'
-                message.action  = 'built'
-                message.text    = 'Run NPM built'              
-                j1.sendMessage( 'j1.adapter.octokit', 'j1.core.octokit', message );
-              }
-            }
+      }); // END shown modal 'webhookCommitDetected'
 
-          }); // END hidden modal 'gitPullSuccess'
-
-          // Register pre/post events for modal 'npmScriptSuccess'
-          // -------------------------------------------------------------------
-          $(document).on('shown.bs.modal','#npmScriptSuccess', 
-            function () {
-              logger.info('Display npmScriptSuccess');
-
-              // Autohide modal if configured
-              if ( options.commit_detection.modal_pull_response.autohide) {
-                var modalTimeOut = setInterval(function() {
-                  $('#npmScriptSuccess').modal('hide');
-                  logger.info('Hide modal on timeout');
-                  // clear interval checking
-                  clearInterval(modalTimeOut);
-                }, options.commit_detection.modal_pull_response.autohidden);
-              }
+      $(document).on('hide.bs.modal','#webhookCommitDetected',
+        function (e) {
+          logger.info('Closed webhookCommitDetected');
+      }); // END hide modal 'webhookCommitDetected'
 
-          }); // END shown modal 'npmScriptSuccess'
 
-          $(document).on('hidden.bs.modal','#npmScriptSuccess', 
-            function () {                              
-              logger.info('Post processing on npmScriptSuccess');
-          }); // END hidden modal 'npmScriptSuccess'
+      // Register pre/post events for modal 'gitPullSuccess'
+      // -------------------------------------------------------------------
+      $(document).on('shown.bs.modal','#gitPullSuccess', 
+        function () {
+          logger.info('Display gitPullSuccess');
 
+          // Autohide modal if configured
+          if ( options.commit_detection.modal_pull_response.autohide) {
+            var modalTimeOut = setInterval(function() {
+              $('#gitPullSuccess').modal('hide');
+              logger.info('Hide modal on timeout');
+              // clear interval checking
+              clearInterval(modalTimeOut);
+            }, options.commit_detection.modal_pull_response.autohidden);
+          }
 
-          // clear interval checking
-          clearInterval(registerEvents);
+      }); // END shown modal 'gitPullSuccess'
+
+      $(document).on('hidden.bs.modal','#gitPullSuccess', 
+        function () {    
+                      
+          logger.info('Post processing on gitPullSuccess');
+
+          if ( options.utility_server.npm_client.enabled ) {
+            if ( options.utility_server.npm_client.built.execute ) {
+            // Send commit message (silent mode)
+            // -------------------------------------------------------------
+            message.type    = 'command'
+            message.action  = 'built'
+            message.text    = 'Run NPM built'              
+            j1.sendMessage( 'j1.adapter.octokit', 'j1.core.octokit', message );
+          }
         }
-      }, 50); // END registerEvents
+
+      }); // END hidden modal 'gitPullSuccess'
+
+      // Register pre/post events for modal 'npmScriptSuccess'
+      // -------------------------------------------------------------------
+      $(document).on('shown.bs.modal','#npmScriptSuccess', 
+        function () {
+          logger.info('Display npmScriptSuccess');
+
+          // Autohide modal if configured
+          if ( options.commit_detection.modal_pull_response.autohide) {
+            var modalTimeOut = setInterval(function() {
+              $('#npmScriptSuccess').modal('hide');
+              logger.info('Hide modal on timeout');
+              // clear interval checking
+              clearInterval(modalTimeOut);
+            }, options.commit_detection.modal_pull_response.autohidden);
+          }
+
+      }); // END shown modal 'npmScriptSuccess'
+
+      $(document).on('hidden.bs.modal','#npmScriptSuccess', 
+        function () {                              
+          logger.info('Post processing on npmScriptSuccess');
+      }); // END hidden modal 'npmScriptSuccess'
 
       logText = 'eventHandler: events registered';
       logger.debug(logText);

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

@@ -42,30 +42,31 @@ regenerate:                             false
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign config            = modules.j1_smooth_scroll %}
+{% assign smooth_scroll_defaults = modules.defaults.smooth_scroll.defaults %}
+{% assign smooth_scroll_settings = modules.smooth_scroll.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign smooth_scroll_options  = smooth_scroll_defaults | merge: smooth_scroll_settings %}
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/assets/themes/j1/adapter/js/smooth_scroll.js
- #  JS Adapter for J1 Scroller (SmoothScroll)
- #
- #  Product/Info:
- #  http://jekyll.one
- #  https://github.com/galambalazs/smoothscroll-for-websites
+ # ~/assets/themes/j1/adapter/js/smooth_scroll.js
+ # JS Adapter for J1 Scroller (SmoothScroll)
  #
- #  Copyright (C) 2019 Juergen Adams
- #  Copyright (C) 2010-2016 Balazs Galambosi
+ # Product/Info:
+ # http://jekyll.one
+ # https://github.com/galambalazs/smoothscroll-for-websites
  #
- #  J1 Template is licensed under the MIT License.
- #  For details, see https://jekyll.one
- #  Smooth Scroll is licensed under the MIT License.
- #  For details, https://github.com/galambalazs/smoothscroll-for-websites
+ # Copyright (C) 2019 Juergen Adams
+ # Copyright (C) 2010-2016 Balazs Galambosi
  #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # Smooth Scroll is licensed under the MIT License.
+ # For details, https://github.com/galambalazs/smoothscroll-for-websites
  # -----------------------------------------------------------------------------
- #  Adapter generated: {{site.time}}
+ # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 'use strict';
@@ -76,7 +77,7 @@ j1.adapter['scroller'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}'; // Set environment
+  var environment   = '{{environment}}';
   var state         = 'not_started';
   var moduleOptions = {};
   var _this;
@@ -103,19 +104,19 @@ j1.adapter['scroller'] = (function (j1, window) {
       logger.info('Module is being initialized');
 
       SmoothScroll({
-        frameRate:              {{ config.frameRate | json }},
-        animationTime:          {{ config.animationTime | json }},
-        stepSize:               {{ config.stepSize | json }},
-        accelerationDelta:      {{ config.accelerationDelta | json }},
-        accelerationMax:        {{ config.accelerationMax | json }},
-        keyboardSupport:        {{ config.keyboardSupport | json }},
-        arrowScroll:            {{ config.arrowScroll | json }},
-        pulseAlgorithm:         {{ config.pulseAlgorithm | json }},
-        pulseScale:             {{ config.pulseScale | json }},
-        pulseNormalize:         {{ config.pulseNormalize | json }},
-        touchpadSupport:        {{ config.touchpadSupport | json }},
-        fixedBackground:        {{ config.fixedBackground | json }},
-        excluded:               {{ config.excluded | json }},
+        frameRate:              {{ smooth_scroll_options.frameRate | json }},
+        animationTime:          {{ smooth_scroll_options.animationTime | json }},
+        stepSize:               {{ smooth_scroll_options.stepSize | json }},
+        accelerationDelta:      {{ smooth_scroll_options.accelerationDelta | json }},
+        accelerationMax:        {{ smooth_scroll_options.accelerationMax | json }},
+        keyboardSupport:        {{ smooth_scroll_options.keyboardSupport | json }},
+        arrowScroll:            {{ smooth_scroll_options.arrowScroll | json }},
+        pulseAlgorithm:         {{ smooth_scroll_options.pulseAlgorithm | json }},
+        pulseScale:             {{ smooth_scroll_options.pulseScale | json }},
+        pulseNormalize:         {{ smooth_scroll_options.pulseNormalize | json }},
+        touchpadSupport:        {{ smooth_scroll_options.touchpadSupport | json }},
+        fixedBackground:        {{ smooth_scroll_options.fixedBackground | json }},
+        excluded:               {{ smooth_scroll_options.excluded | json }},
       });
 
       state = 'finished';

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

@@ -130,16 +130,16 @@ j1.adapter['searcher'] = (function (j1, window) {
           noResultsText:        moduleOptions.no_results_text
         });
       } else {
-        var delayLog = setInterval(function() {
-          if ( j1.getState() === 'finished' ) {
+        // var delayLog = setInterval(function() {
+        //   if ( j1.getState() === 'finished' ) {
             state   = 'disabled';
             logger.info('state: ' + state);
             logger.info("J1 QuickSearch disabled");
 
             // clear interval checking
-            clearInterval(delayLog);
-          } // END Manage cookie consent dialog
-        }, 50); // END setInterval
+        //     clearInterval(delayLog);
+        //   } // END Manage cookie consent dialog
+        // }, 50); // END setInterval
       }
 
       // state = 'finished';

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

@@ -44,28 +44,29 @@ regenerate:                             false
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign stickybits_config = modules.j1_stickybits.default %}
+{% assign stickybits_defaults = modules.defaults.stickybits.defaults %}
+{% assign stickybits_settings = modules.stickybits.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign stickybits_options  = stickybits_defaults | merge: stickybits_settings %}
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/assets/themes/j1/adapter/js/stickybits.js
- #  JS Adapter for J1 Stickybits
- #
- #  Product/Info:
- #  https://jekyll.one
- #  https://github.com/dollarshaveclub/stickybits
+ # ~/assets/themes/j1/adapter/js/stickybits.js
+ # JS Adapter for J1 Stickybits
  #
- #  Copyright (C) 2019 Juergen Adams
- #  Copyright (C) 2016 Dollar Shave Club, Inc.
+ # Product/Info:
+ # https://jekyll.one
+ # https://github.com/dollarshaveclub/stickybits
  #
- #  J1 Template is licensed under the MIT License.
- #  For details, see https://jekyll.one
+ # Copyright (C) 2019 Juergen Adams
+ # Copyright (C) 2016 Dollar Shave Club, Inc.
  #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
- #  Adapter generated: {{site.time}}
+ # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 'use strict';
@@ -102,7 +103,7 @@ j1.Stickybits = (function (j1, window) {
       state = 'started';
       logger.info('state: ' + state);
 
-      stickybitsInstance = stickybits('{{stickybits_config.selector}}', {
+      stickybitsInstance = stickybits('{{stickybits_options.selector}}', {
         useStickyClasses:       {{site.data.modules.j1_stickybits.default.useStickyClasses}},
         stickyBitStickyOffset:  "{{site.data.modules.j1_stickybits.default.offset}}px"
       });