j1-template 2020.0.9 → 2020.0.14

data/assets/themes/j1/adapter/js/{justified_gallery.js → jf_gallery.js}

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -44,6 +44,11 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign jf_gallery_options    = jf_gallery_defaults | merge: jf_gallery_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/justified_gallery.js
@@ -64,11 +69,16 @@ regenerate:                             true
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-// j1.JustifiedGallery = (function (j1, window) {
 j1.adapter['jf_gallery'] = (function (j1, window) {
 
   {% comment %} Global variables
@@ -92,9 +102,16 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function (options) {
-      // initialize state flag
-      j1.adapter.jf_gallery.state = 'pending';
 
+      {% comment %} Set global variables
+      -------------------------------------------------------------------------- {% endcomment %}
+      _this = j1.adapter.jf_gallery;
+      logger = log4javascript.getLogger('j1.adapter.jf_gallery');
+
+      // initialize state flag
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('module is being initialized');
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -108,24 +125,19 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       // Load  module DEFAULTS|CONFIG
       //
+      /* eslint-disable */
       moduleOptions = $.extend({}, {{jf_gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
 
       if (typeof settings !== 'undefined') {
         moduleOptions = j1.mergeData(moduleOptions, settings);
       }
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
-      _this = j1.adapter.jf_gallery;
-      logger = log4javascript.getLogger('j1.adapter.jf_gallery');
-
-      _this.setState('started');
-      logger.info('state: ' + _this.getState());
-      logger.info('module is being initialized');
-
       _this.initialize(moduleOptions);
 
-      return true;
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initialized successfully');
     },
 
     // -----------------------------------------------------------------------
@@ -196,23 +208,23 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
           $('#{{gallery_id}}').before(gallery_title);
           {% endif %}
 
-          $('#{{gallery_id}}').addClass("justified-gallery {{css_classes}}");
+          $('#{{gallery_id}}').addClass('justified-gallery {{css_classes}}');
 
           {% if gallery_type == "image" %}
             // Collect image gallery data from data file (xhr_data_path)
             $.getJSON('{{jf_gallery_options.xhr_data_path}}', function (data) {
               var content = '';
-              var gallery_class = 'justified-gallery'
+              var gallery_class = 'justified-gallery';
               {% if lightbox == "lg" %}
               gallery_class += ' light-gallery ';
               {% endif %}
 
-              for (var i in data["{{item.gallery.id}}"]) {
-                var img               = data["{{item.gallery.id}}"][i].img;
-                // var img               = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var captions_gallery  = data["{{item.gallery.id}}"][i].captions_gallery;
-                var captions_lightbox = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var lightbox          = "{{lightbox}}";
+              for (var i in data['{{item.gallery.id}}']) {
+                var img               = data['{{item.gallery.id}}'][i].img;
+//              var img               = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var captions_gallery  = data['{{item.gallery.id}}'][i].captions_gallery;
+                var captions_lightbox = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var lightbox          = '{{lightbox}}';
 
                 if (captions_lightbox != null && lightbox == 'lg') {
                   content +=  '<a data-sub-html="' +captions_lightbox+ '" ';
@@ -227,25 +239,25 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
 
               } // END for
 
-          {% elsif gallery_type == "video-html5" or gallery_type == "video-online" %}        
+          {% elsif gallery_type == "video-html5" or gallery_type == "video-online" %}
 
             // Collect html5 video gallery data from data file (xhr_data_path)
             $.getJSON('{{jf_gallery_options.xhr_data_path}}', function (data) {
-              var play_button = '/assets/themes/j1/extensions/light_gallery/css/themes/icons/play-button.png';
+              var play_button = '/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png';
               var content = '';
-              var gallery_class = 'justified-gallery'
+              var gallery_class = 'justified-gallery';
               {% if lightbox == "lg" %}
               gallery_class += ' light-gallery ';
               {% endif %}
 
-              for (var i in data["{{item.gallery.id}}"]) {
-                // var img               = data["{{item.gallery.id}}"][i].img;
-                var img               = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var captions_gallery  = data["{{item.gallery.id}}"][i].captions_gallery;
-                var captions_lightbox = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var video_id          = data["{{item.gallery.id}}"][i].video_id;
-                var video             = data["{{item.gallery.id}}"][i].video;
-                var lightbox          = "{{lightbox}}"; 
+              for (var i in data['{{item.gallery.id}}']) {
+//              var img               = data['{{item.gallery.id}}'][i].img;
+                var img               = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var captions_gallery  = data['{{item.gallery.id}}'][i].captions_gallery;
+                var captions_lightbox = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var video_id          = data['{{item.gallery.id}}'][i].video_id;
+                var video             = data['{{item.gallery.id}}'][i].video;
+                var lightbox          = '{{lightbox}}';
 
                 if (captions_lightbox != null && lightbox == 'lg') {
                   content +=  '<a data-sub-html="' +captions_lightbox+ '" ';
@@ -257,23 +269,23 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
                   {% endif %}
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_lightbox+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/extensions/light_gallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
                 } else {
                   content +=  '<a data-sub-html="' +captions_gallery+ '" ';
                   content +=  'href="' +img+ '">' + '\n';
                   content +=  '<img src="' +img+ '" img alt="' +captions_gallery+ '">' + '\n';
-                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/extensions/light_gallery/css/themes/icons/play-button.png"></span>' + '\n';
+                  content +=  '<span><img class="justified-gallery img-overlay" src="/assets/themes/j1/modules/lightGallery/css/themes/icons/play-button.png"></span>' + '\n';
                 }
                 content +=  '</a>' + '\n';
 
               } // END for
 
               var hidden_video_div = '';
-              for (var i in data["{{item.gallery.id}}"]) {
-                var video        = data["{{item.gallery.id}}"][i].video_path + '/' + data["{{item.gallery.id}}"][i].video;
-                var poster       = data["{{item.gallery.id}}"][i].image_path + '/' + data["{{item.gallery.id}}"][i].poster;
-                var caption      = data["{{item.gallery.id}}"][i].captions_lightbox;
-                var video_id     = data["{{item.gallery.id}}"][i].video_id;
+              for (var i in data['{{item.gallery.id}}']) {
+                var video        = data['{{item.gallery.id}}'][i].video_path + '/' + data['{{item.gallery.id}}'][i].video;
+                var poster       = data['{{item.gallery.id}}'][i].image_path + '/' + data['{{item.gallery.id}}'][i].poster;
+                var caption      = data['{{item.gallery.id}}'][i].captions_lightbox;
+                var video_id     = data['{{item.gallery.id}}'][i].video_id;
                 var video_type   = video.substr(video.lastIndexOf('.') + 1);
                 hidden_video_div += '<div style="display:none;" id="' +video_id+ '">' + '\n';
                 hidden_video_div += '  <video class="lg-video-object lg-html5 video-js vjs-default-skin"' + '\n';
@@ -284,59 +296,70 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
                 hidden_video_div += '</div>' + '\n';
               }
               $('#{{ gallery_id }}').before(hidden_video_div);
-       
+
           {% endif %}
 
               // Hide gallery container (until lightGallery is NOT initialized)
               // and place HTML markup
-              $("#{{gallery_id}}").hide().html(content);
+              $('#{{gallery_id}}').hide().html(content);
               // Initialize and run the gallery using individual gallery|lightbox options
               {% if lightbox == "lg" %}
-                var gallery_selector = $("#{{gallery_id}}");
+                var gallery_selector = $('#{{gallery_id}}');
                 if (options !== undefined) {
                   // lightbox initialized on COMPLETE event of justifiedGallery
+                  /* eslint-disable */
                   gallery_selector.justifiedGallery({
                     {% for option in item.gallery.gallery_options %}
                     {{option[0] | json}}: {{option[1] | json}},
                     {% endfor %}
                   })
+                  /* eslint-enable */
                   .on('jg.complete', function (e) {
                     e.stopPropagation();
+
                     // options enabled
+                    /* eslint-disable */
                     gallery_selector.lightGallery({
                       {% for option in item.gallery.lightbox_options %}
                       {{option[0] | json}}: {{option[1] | json}},
                       {% endfor %}
                     });
+                    /* eslint-enable */
+
                     // Initialize instance variable of lightGallery (for later access)
                     j1['{{gallery_id}}'] = gallery_selector.data('lightGallery');
                     // Show gallery DIV element if jg has completed *and* the
                     // lightbox is initialized (delayed)
-                    setTimeout(function() { 
-                      $("#{{gallery_id}}").show();
+                    setTimeout(function() {
+                      $('#{{gallery_id}}').show();
                       logText = 'initializing gallery finished on id: #{{gallery_id}}';
                       logger.info(logText);
                     }, {{show_delay}});
                   });
                 } else {
+                  /* eslint-disable */
                   gallery_selector.justifiedGallery({
                     {% for option in item.gallery.gallery_options %}
                     {{option[0] | json}}: {{option[1] | json}},
                     {% endfor %}
+                  /* eslint-enable */
                   }).on('jg.complete', function (e) {
                      e.stopPropagation();
                     // lightbox initialized on COMPLETE event of justifiedGallery
+                    /* eslint-disable */
                     gallery_selector.lightGallery({
                       {% for option in item.gallery.lightbox_options %}
                       {{option[0] | json}}: {{option[1] | json}},
                       {% endfor %}
                     });
+                    /* eslint-enable */
+
                     // Initialize instance variable of lightGallery (for later access)
                     j1['{{gallery_id}}'] = gallery_selector.data('lightGallery');
                     // Show gallery DIV element if jg has completed *and* the
                     // lightbox is initialized (delayed)
-                    setTimeout(function() { 
-                      $("#{{gallery_id}}").show();
+                    setTimeout(function() {
+                      $('#{{gallery_id}}').show();
                       logText = 'initializing gallery finished on id: #{{gallery_id}}';
                       logger.info(logText);
                       }, {{show_delay}});
@@ -380,24 +403,28 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.jf_gallery.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.jf_gallery.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);
 
 {% endcapture %}
-{{cache | strip_empty_lines}}
-{% assign cache = nil %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -47,6 +47,11 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign lightbox_options   = lightbox_defaults | merge: lightbox_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/lightbox.js
@@ -68,6 +73,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 {% comment %} Main
@@ -99,8 +110,9 @@ j1.adapter['lightbox'] = (function (j1, window) {
       // initialize state flag
       j1.adapter.lightbox.state = 'pending';
 
-      {% comment %} Set global variables
-      -------------------------------------------------------------------------- {% endcomment %}
+      // -----------------------------------------------------------------------
+      // globals
+      // -----------------------------------------------------------------------
       _this   = j1.adapter.lightbox;
       logger  = log4javascript.getLogger('j1.adapter.lightbox');
 
@@ -108,6 +120,7 @@ j1.adapter['lightbox'] = (function (j1, window) {
       logger.info('state: ' + _this.getState());
       logger.info('module is being initialized');
 
+      /* eslint-disable */
       lightbox.option({
         alwaysShowNavOnTouchDevices:  {{ lightbox_options.alwaysShowNavOnTouchDevices | json }},
         albumLabel:                   {{ lightbox_options.albumLabel | json }},
@@ -122,6 +135,7 @@ j1.adapter['lightbox'] = (function (j1, window) {
         showImageNumberLabel:         {{ lightbox_options.showImageNumberLabel | json }},
         wrapAround:                   {{ lightbox_options.wrapAround | json }}
       });
+      /* eslint-enable */
 
       _this.setState('finished');
       logger.info('state: ' + _this.getState());
@@ -158,24 +172,28 @@ j1.adapter['lightbox'] = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    // setState
-    // Set the current (processing) state of the module
+    // setState()
+    // Sets the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function (stat) {
-      j1.adapter.lightbox.state = stat;
+      _this.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    // getState
+    // getState()
     // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return j1.adapter.lightbox.state;
-    } // END state
+      return _this.state;
+    } // END getState
 
   }; // END return
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
-{% assign cache = nil %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate: true
 ---
 
 {% capture cache %}
@@ -48,6 +48,11 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign logger_options    = logger_defaults | merge: logger_settings %}
 
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/logger.js
@@ -64,6 +69,12 @@ regenerate:                             false
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
 'use strict';
 
 j1.adapter['logger'] = (function (j1, window) {
@@ -72,7 +83,7 @@ j1.adapter['logger'] = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment           = '{{environment}}';
-  var page_id               = uuid().slice(25, 37);
+  var page_id               = j1.generateId(12);
   var cookie_names          = j1.getCookieNames();
   var loggerRequestCallback = false;
   var loggerOptions         = {};
@@ -106,7 +117,7 @@ j1.adapter['logger'] = (function (j1, window) {
   var getCustomData = function(layout, loggingReference) {
     var customData = [];
 
-    try {(0)()} catch (e) {
+    try { (0)(); } catch (e) {
       var pattern = /^(.+?) ?\(?((?:file|https?|chrome-extension):.*?):(\d+)(?::(\d+))?\)?\s*$/ig;
       // Split the stack trace
       var output = e.stack.replace(/^.*?\n/,'').replace(/(?:\n@:0)?\s+$/m,'').replace(/^\(/gm,'{anon}(').split('\n');
@@ -138,8 +149,8 @@ j1.adapter['logger'] = (function (j1, window) {
     }
 
     // return custom field %f{1}
-    return customData[0].value
-  }
+    return customData[0].value;
+  };
 
   var requestCallback = function(data) {
     var xhrData = data;
@@ -147,7 +158,7 @@ j1.adapter['logger'] = (function (j1, window) {
     // place handling of command|action here
     //
     return;
-  }
+  };
 
   // ---------------------------------------------------------------------------
   // main object
@@ -162,7 +173,9 @@ j1.adapter['logger'] = (function (j1, window) {
       j1.adapter.logger.state = 'started';
 
       // load module DEFAULTS|CONFIG to js object
+      /* eslint-disable */
       loggerOptions       = $.extend({}, {{logger_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      /* eslint-enable */
       ajaxAppenderOptions = loggerOptions.appenders[1].appender;
 
       // -----------------------------------------------------------------------
@@ -253,11 +266,9 @@ j1.adapter['logger'] = (function (j1, window) {
             logger.info('ajax appender detected as: disabled');
           }
 
-          _this.setState('started');
-          logger.info('state: ' + _this.getState());
-
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
 
           return true;
         }
@@ -312,5 +323,9 @@ j1.adapter['logger'] = (function (j1, window) {
 })(j1, window);
 
 {% endcapture %}
-{{ cache | strip_empty_lines }}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}