j1_template 2019.4.8 → 2019.4.10

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

@@ -92,8 +92,7 @@ j1.adapter['back2top'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment    = '{{environment}}'; // Set environment
-  var state          = 'not_started';
+  var environment    = '{{environment}}';
   var moduleOptions  = {};
   var _this;
   var logger;
@@ -112,6 +111,8 @@ j1.adapter['back2top'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+      // initialize state flag
+      j1.adapter.back2top.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -124,37 +125,33 @@ j1.adapter['back2top'] = (function (j1, window) {
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.back2top;
-      logger  = log4javascript.getLogger('j1.adapter.back2top'); 
+      logger  = log4javascript.getLogger('j1.adapter.back2top');
 
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       moduleOptions = $.extend({}, {{back2top_options | replace: '=>', ':' | replace: 'nil', '""'}});
 
-      if ( typeof settings !== 'undefined') { 
-        moduleOptions = j1.mergeData(moduleOptions, settings); 
+      if ( typeof settings !== 'undefined') {
+        moduleOptions = j1.mergeData(moduleOptions, settings);
       }
-      
+
       if (moduleOptions.enabled) {
-        state   = 'started';
-        logger.info('state: ' + state);
-        logger.info('Module is being initialized');
+        _this.setState('started');
+        logger.info('state: ' + _this.getState());
+        logger.info('module is being initialized');
 
-        _this.setCss(); 
+        _this.setCss();
         j1.core.back2top.init(moduleOptions);
+
+        _this.setState('finished');
+        logger.info('state: ' + _this.getState());     
       } else {
-        // var delayLog = setInterval(function() {
-        //   if ( j1.getState() === 'finished' ) {
-            state   = 'disabled';
-            logger.info('state: ' + state);
-            logger.info("J1 Back2Top disabled");
-
-        //     // clear interval checking
-        //     clearInterval(delayLog);
-        //   } // END Manage cookie consent dialog
-        // }, 50); // END setInterval
+        _this.setState('finished');
+        logger.info('state: ' + _this.getState());
+        logger.warn('modulec back2top disabled');
       }
-     
+
       return true;
     }, // END init
 
@@ -162,15 +159,16 @@ j1.adapter['back2top'] = (function (j1, window) {
     // Set dynamic styles for Back2Top
     // -------------------------------------------------------------------------
     setCss: function () {
-      var dataLoaded = setInterval(function() {
-        if (typeof j1.colors !== 'undefined') {
-          // clear interval checking
-          clearInterval(dataLoaded);
+      var bg_primary  = j1.getStyleValue('bg-primary', 'background-color');
 
+      var dependencies_met_back2top_adapter = setInterval(function() {
+        if (typeof j1.colors !== 'undefined') {
           $('head').append('<style>#topcontrol { background: ' + j1.colors['{{background_color}}'] + '; }</style>');
-          $('head').append('<style>#topcontrol:hover { background: ' + j1.colors['{{active_color}}'] + '; }</style>');
+          // $('head').append('<style>#topcontrol:hover { background: ' + j1.colors['{{active_color}}'] + '; }</style>');
+          $('head').append('<style>#topcontrol:hover { background: ' +bg_primary+ '; }</style>');
           $('head').append('<style>#topcontrol:after { content: "\\{{back2top_icon}}"; font-family: {{back2top_icon_family}}; }</style>');
-
+          // clear interval checking
+          clearInterval(dependencies_met_back2top_adapter);
         } // END 'getState'
       }, 50); // END 'dataLoaded'
 
@@ -181,9 +179,9 @@ j1.adapter['back2top'] = (function (j1, window) {
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -191,7 +189,9 @@ j1.adapter['back2top'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -203,17 +203,19 @@ j1.adapter['back2top'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.scroller.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.scroller.state;
     } // END state
 
   }; // END return

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

@@ -71,9 +71,8 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}'; // Set environment
-  var state         = 'not_started';
-  var moduleOptions = {}; 
+  var environment   = '{{environment}}';
+  var moduleOptions = {};
   var _this;
   var logger;
   var logText;
@@ -91,6 +90,8 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function ( options ) {
+      // initialize state flag
+      j1.adapter.bs_gallery.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -103,21 +104,21 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.bs_gallery;
-      logger  = log4javascript.getLogger('j1.adapter.bs_gallery'); 
+      logger  = log4javascript.getLogger('j1.adapter.bs_gallery');
 
       {% comment %} Load module config from yml data
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       //
       // moduleOptions = $.extend({}, {{jekyll_search_options | replace: '=>', ':' | replace: 'nil', '""'}});
-      // 
-      // if ( typeof settings !== 'undefined') { 
+      //
+      // if ( typeof settings !== 'undefined') {
       //   moduleOptions = j1.mergeData( moduleOptions, settings );
-      // }  
+      // }
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       _this.bgInit();
 
@@ -154,12 +155,10 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
           // Create an gallery instance if {{ container_id }} exists
           if ( $('#{{ container_id }}').length ) {
 
-            {% if environment == 'development' %}
-              logText = 'gallery on ID #{{ container_id }} is being initialized';
-              logger.info(logText);
-              state = 'running';
-              logger.info('state: ' + state); // Set|Log status
-            {% endif %}
+            logText = 'gallery on ID #{{container_id}} is being initialized';
+            _this.setState('running');
+            logger.info('state: ' + _this.getState());
+            logger.info(logText);
 
             // Place HTML markup for the title
             {% if gallery_title %}
@@ -296,13 +295,10 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
                 // Initialize instance variable of lightGallery  (for later access)
                 j1["{{gallery_id}}"] = $('#{{ gallery_id }}').data('lightGallery');
 
-                {% if environment == 'development' %}
-                  logText = 'LightGallery on ID #{{ container_id }} initializing completed';
-                  logger.info(logText);
-                  state = 'completed';
-                  logger.info('state: ' + state); // Set|Log status
-                {% endif %}
-
+                logText = 'LightGallery on ID #{{ container_id }} initializing finished';
+                _this.setState('finished');
+                logger.info('state: ' + _this.getState());
+                logger.info(logText);
             });
           } //end gallery
         {% endif %} {% comment %} end if enabled {% endcomment %}
@@ -315,9 +311,9 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -325,7 +321,9 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -337,21 +335,23 @@ j1.adapter['bs_gallery'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.scroller.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.scroller.state;
     } // END state
 
   }; // END return
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{{ cache | strip_empty_lines }}

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

@@ -69,8 +69,7 @@ regenerate:                             false
 {% comment %} Main
 --------------------------------------------------------------- {% endcomment %}
 j1.adapter['carousel'] = (function (j1, window) {
-  var environment   = '{{environment}}'; // Set environment
-  var state         = 'unknown';
+  var environment   = '{{environment}}';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -89,6 +88,8 @@ j1.adapter['carousel'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
+      // initialize state flag
+      j1.adapter.carousel.state = 'pending';
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -103,18 +104,18 @@ j1.adapter['carousel'] = (function (j1, window) {
       // Load  module DEFAULTS|CONFIG
       moduleOptions = $.extend({}, {{carousel_settings | replace: '=>', ':' | replace: 'nil', '""'}});
 
-      if ( typeof settings !== 'undefined') { 
+      if ( typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData( moduleOptions, settings );
-      }  
+      }
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this   = j1.adapter.carousel;    
+      _this   = j1.adapter.carousel;
       logger  = log4javascript.getLogger('j1.adapter.carousel');
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       {% for item in carousel_options.carousel %}
 
@@ -131,8 +132,10 @@ j1.adapter['carousel'] = (function (j1, window) {
             {% if environment == 'development' %}
               logText = 'Slider on ID {{ slider_id }} being initialized';
               logger.info(logText);
-              state = 'running';
-              logger.info('state: ' + state); // Set|Log status
+              _this.setState('running');
+              logger.info('state: ' + _this.getState());
+              logger.info('module is being initialized');
+
             {% endif %}
 
             {% if item.show.slide_height != null %}
@@ -242,30 +245,27 @@ j1.adapter['carousel'] = (function (j1, window) {
                 {% endif %}
               }
               $("#{{ slider_id }}").html(content);
-
-              {% if environment == 'development' %}
-                logText = 'Slider on ID {{ slider_id }} initializing finished';
-                logger.info(logText);
-                //state = 'finished';
-                //logger.info('state: ' + state); // Set|Log status
-              {% endif %}
-
+              logText = 'Slider on ID {{ slider_id }} initializing finished';
+              logger.info(logText);
             } // END customDataSuccess_{{ forloop.index }}
           } // END if carousel exists
         {% endif %}
       {% endfor %}
 
-      state = 'finished';
-      logger.info('state: ' + state); // Set|Log status
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initializing finished');
+
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -273,7 +273,9 @@ j1.adapter['carousel'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -285,22 +287,25 @@ j1.adapter['carousel'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.scroller.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.scroller.state;
     } // END state
 
+
   }; // END return
 
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{{ cache | strip_empty_lines }}

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

@@ -52,8 +52,7 @@ regenerate:                             true
 --------------------------------------------------------------- {% endcomment %}
 j1.adapter['cookie_bar'] = (function (j1, window) {
 
-  var environment   = '{{environment}}'; // Set environment
-  var state         = 'unknown';
+  var environment   = '{{environment}}';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -68,20 +67,21 @@ j1.adapter['cookie_bar'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   return {
 
-
     // -------------------------------------------------------------------------
     // Initializer
     // -------------------------------------------------------------------------
     init: function () {
+      // initialize state flag
+      j1.adapter.cookie_bar.state = 'pending';
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.cookie_bar;
       logger  = log4javascript.getLogger('j1.adapter.cookie_bar');
 
-      state = 'started';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       $.cookieBar ({
         stopScrolling:          {{ config.stopScrolling | json }},
@@ -112,19 +112,20 @@ j1.adapter['cookie_bar'] = (function (j1, window) {
         referrer:               {{ config.referrer | json }}
       });
 
-      state = 'finished';
-      logger.info('state: ' + state);
-      logger.info('Module initialized successfully');
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initializing finished');
 
+      return true;
     }, // END init
 
     // -------------------------------------------------------------------------
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -132,7 +133,9 @@ j1.adapter['cookie_bar'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -144,17 +147,19 @@ j1.adapter['cookie_bar'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.cookie_bar.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.cookie_bar.state;
     } // END state
 
   }; // END return
@@ -163,4 +168,4 @@ j1.adapter['cookie_bar'] = (function (j1, window) {
 {% endcapture %}
 
 {{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% assign cache = nil %}