j1-template 2023.10.0 → 2023.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436614a2e5cc0cc0f4ada349f24e6f12022e425000a5929a6d9bc4b15962d590
-  data.tar.gz: 9adb217f0ed86a29d77e91fda0b5f326443870740d8f3928ba07602fdd7f82a3
+  metadata.gz: 5e2e3a1f57f7350be094b38562a4929160b671bce020f20d0614e2df8d13e6f8
+  data.tar.gz: 7530223f266fcf8e670dd2f943ee4f0fea6b8de7c1c5930a179a9c222b6d9715
 SHA512:
-  metadata.gz: 76996407fc376c0c5fd378f6b6271cdc87d560d2e05e5c411b5c93f76c071fbe06036ce8d23b4e0067f7b05d43a49705602c40a9e6c0e5603599d09da6f5dec5
-  data.tar.gz: 654aa35ba71533e503c71ab8779c7288ee2ef37be8f46d8bab483aac33a0a84af6b8eafbcf065bc7c3d43138e0b6377ca17759fcbeb9f0d0315cd81f54dda1cd
+  metadata.gz: d3d37529cbb204e1da5a3e25db2efa6777550713955cfc2f6830c546fb6c16a38a9f22644280e61bd81e4d776e79f61d1f09e97e775f8c9e05c4d770d54e1d8f
+  data.tar.gz: f64552caa5148edfc516f3d4e9e21ac8d56c6b44e9910ff7c612059124b15bf878bb49dc6ad38e963153dbca36d65ec6a6cad5f6b4191db317471047cceb72d8

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

@@ -89,6 +89,8 @@ j1.adapter.gallery = (function (j1, window) {
   var environment   = '{{environment}}';
   var state         = 'not_started';
   var play_button   = '/assets/themes/j1/modules/lightGallery/css/themes/uno/icons/play-button.png';
+  var url;
+  var origin;
   var galleryDefaults;
   var gallerySettings;
   var galleryOptions;
@@ -111,6 +113,9 @@ j1.adapter.gallery = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function (options) {
 
+      url     = new URL(window.location.href);
+      origin  = url.origin;
+
       // -----------------------------------------------------------------------
       // Default module settings
       // -----------------------------------------------------------------------
@@ -143,8 +148,6 @@ j1.adapter.gallery = (function (j1, window) {
         var atticFinished = (j1.adapter.attic.getState() == 'finished') ? true: false;
 
         if (j1.getState() == 'finished' && pageVisible) {
-//      if (j1.getState() == 'finished' && pageVisible && atticFinished) {
-
           // initialize state flag
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
@@ -157,7 +160,7 @@ j1.adapter.gallery = (function (j1, window) {
           logger.info('\n' + 'module initialized successfully');
 
           clearInterval(dependencies_met_j1_finished);
-        }
+        } // END 'finished' && 'pageVisible'
       }, 10);
     },
 
@@ -192,11 +195,10 @@ j1.adapter.gallery = (function (j1, window) {
             if ( xhrLoadState === 'success' ) {
               var $grid_{{gallery_id}} = $('#{{gallery_id}}');                  // used for later access
 
-              logger.info('\n' + 'initialize gallery on id: ' + '{{gallery_id}}');
+              logger.info('\n' + 'dyn_loader: initialize gallery on id: ' + '{{gallery_id}}');
 
-              // run code after all images are loaded with the gallery
-              //
-              $grid_{{gallery_id}}.justifiedGallery({
+              /* eslint-disable */
+              $('#{{gallery_id}}').justifiedGallery({
                 {% for option in gallery.gallery_options %}
                 {% if option[0] contains "gutters" %}
                 {{'margins' | json}}: {{option[1] | json}},
@@ -204,34 +206,87 @@ j1.adapter.gallery = (function (j1, window) {
                 {% endif %}
                 {{option[0] | json}}: {{option[1] | json}},
                 {% endfor %}
-              });
-
-              // jadams, 2023-10-18:
-              // For unknown reason, the callback on('jg.complete') does
-              // not work as expected. Replace by a simple rimeout function
-              //
-              setTimeout (function() {
-                logger.info('\n' + 'initialize LightGallery on id: ' + '{{gallery_id}}');
-                /* eslint-disable */
-                var lg      = document.getElementById("{{gallery_id}}");
-                var gallery = lightGallery(lg, {
+              })
+              .on('jg.complete', function (evt) {
+                evt.stopPropagation();
+
+                // setup the lightbox
+                //
+                logger.info('\n' + 'dyn_loader: callback "jg.complete" entered on id: ' + '{{gallery_id}}');
+                logger.info('\n' + 'dyn_loader: initialize lightGallery on id: ' + '{{gallery_id}}');
+
+                var lg = document.getElementById("{{gallery_id}}");
+                lightGallery(lg, {
                   "plugins":    [{{gallery.lightGallery.plugins}}],
                   {% for option in gallery.lightGallery.options %}
                   {{option[0] | json}}: {{option[1] | json}},
                   {% endfor %}
                   "galleryId":  "{{gallery_id}}",
                   "selector":   ".lg-item",
+                  {% if gallery.video == 'html5' and gallery.lightGallery.videojsOptions.enabled %}
                   "videojsOptions": {
                     {% for option in gallery.lightGallery.videojsOptions %}
+                    {% if option[0] contains "enabled" %}
+                    {% continue %}
+                    {% endif %}
+                    {{option[0] | json}}: {{option[1] | json}},
+                    {% endfor %}
+                  }
+                  {% endif %}
+
+                  {% if gallery.video == 'youtube' and gallery.lightGallery.playerParams.enabled %}
+                  "youTubePlayerParams": {
+                    {% for option in gallery.lightGallery.playerParams %}
+                    {% if option[0] contains "enabled" %}
+                    {% continue %}
+                    {% endif %}
+                    {{option[0] | json}}: {{option[1] | json}},
+                    {% endfor %}
+                    "origin": "origin"
+                  }
+                  {% endif %}
+
+                  {% if gallery.video == 'vimeo' and gallery.lightGallery.playerParams.enabled %}
+                  "vimeoPlayerParams": {
+                    {% for option in gallery.lightGallery.playerParams %}
+                    {% if option[0] contains "enabled" %}
+                    {% continue %}
+                    {% endif %}
+                    {{option[0] | json}}: {{option[1] | json}},
+                    {% endfor %}
+                  }
+                  {% endif %}
+
+                  {% if gallery.video == 'dailymotion' and gallery.lightGallery.playerParams.enabled %}
+                  "dailymotionPlayerParams": {
+                    {% for option in gallery.lightGallery.playerParams %}
+                    {% if option[0] contains "enabled" %}
+                    {% continue %}
+                    {% endif %}
+                    {{option[0] | json}}: {{option[1] | json}},
+                    {% endfor %}
+                  }
+                  {% endif %}
+
+                  {% if gallery.video == 'wistia' and gallery.lightGallery.playerParams.enabled %}
+                  "wistiaPlayerParams": {
+                    {% for option in gallery.lightGallery.playerParams %}
+                    {% if option[0] contains "enabled" %}
+                    {% continue %}
+                    {% endif %}
                     {{option[0] | json}}: {{option[1] | json}},
                     {% endfor %}
                   }
-                });
-                /* eslint-enable */
-              }, galleryOptions.gallery_complete_timeout);
+                  {% endif %}
+
+                }); // END lightGallery
+
+              }); // END justifiedGallery on('jg.complete)
+              /* eslint-enable */
+
+              clearInterval(load_dependencies['dependencies_met_html_loaded_{{gallery_id}}']);
+            } // END  if xhrLoadState === 'success'
 
-            }
-            clearInterval(load_dependencies['dependencies_met_html_loaded_{{gallery_id}}']);
           }, 10); // END dependencies_met_html_loaded
 
         {% endif %} // ENDIF gallery enabled

data/assets/themes/j1/core/css/themes/unolight/bootstrap.css

@@ -26885,17 +26885,17 @@ $caret-width-lg:                      $caret-width !default;
 .g-max-height-500 {
   min-height: 500px !important; }
 
-/*
- # -----------------------------------------------------------------------------
- # ~/scss/theme_uno/extensions/_video.scss
- # Product/Info:
- # https://jekyll.one
- #
- # Copyright (C) 2023 Juergen Adams
- #
- # J1 Template is licensed under the MIT License.
- # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
- # ------------------------------------------------------------------------------
+/*
+ # -----------------------------------------------------------------------------
+ # ~/scss/theme_uno/extensions/_video.scss
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2023 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # ------------------------------------------------------------------------------
 */
 video {
   width: 100%;