Changeset 3006502

Timestamp:

12/06/2023 11:39:41 PM (16 months ago)

Author:

firmcatalyst

Message:

defer fixed, wp 6.4 tested

Location:

fcp-lightest-lightbox/trunk

Files:

• assets/script.js (modified) (3 diffs)
• assets/style.css (modified) (3 diffs)
• fcp-lightbox.php (modified) (3 diffs)
• loader.js (modified) (1 diff)
• readme.txt (modified) (1 diff)

fcp-lightest-lightbox/trunk/assets/script.js

@@ -171 +171 @@
     };
 
+    // ******* print figcaption
+
+    const figcaption = d.createElement( 'div' );
+    figcaption.className = 'fcplb-caption';
+    holder.prepend( figcaption );
+    
+    function get_figcaption(a) {
+        while ( a.parentNode ) {
+            a = a.parentNode;
+            if ( a === d ) { return false }
+            if ( a.tagName.toLowerCase() !== 'figure' ) { continue }
+            const caption = a.querySelector( 'figcaption' ),
+                html = caption !== null && caption.innerHTML;
+            return html;
+        }
+        return false;
+    }
+
+    const open_figcapture = open;
+    open = a => {
+        const caption = get_figcaption( a );
+        figcaption.innerHTML = caption || '';
+        return open_figcapture( a );
+    };
 
     // ******* swipe & finger support
@@ -244 +268 @@
                 holder.classList.add( 'fcplb-swipe-return' ); // return to the center
 
+                // ++prevent changing direction on diagonal move (only prev-next or only close, as started)
                 // ++add 2 fingers && 2 buttons to zoom
                 // ++doubleclick to restore the zoom lvl
+                // ++add more styles
             });
 
@@ -269 +295 @@
         }
     };
-
+    //d.querySelector( p.selector ).dispatchEvent( new Event( 'click' ) ); // for easier testing
 })();

fcp-lightest-lightbox/trunk/assets/style.css

@@ -15 +15 @@
 #fcplb.fcplb-active {
     opacity:1;
-    z-index:99996;
+    z-index:99995;
     transition:opacity .2s ease-out, z-index 0s linear;
 }
@@ -21 +21 @@
     max-width:94%;
     max-height:95%;
-    z-index:99997;
+    z-index:99996;
 }
 
@@ -153 +153 @@
     content:none;
 }
+
+/* caption figcaption */
+.fcplb-caption {
+    display:block;
+    position:fixed;
+    left:0;
+    right:0;
+    bottom:0;
+    z-index:99996;
+    padding:20px;
+    box-sizing:border-box;
+    text-align:center;
+    color:#fff;
+    background-color:#000000bb;
+}
+.fcplb-caption:empty {
+    display:none;
+}

fcp-lightest-lightbox/trunk/fcp-lightbox.php

@@ -4 +4 @@
 Plugin Name: FCP Lightest Lightbox
 Description: Super lightweight lighbox. It tracks the links to images and makes it open in a popup lightbox. It also adds prev-next navigation to galleries or image sequences.
-Version: 1.4.1
+Version: 1.4.2
 Requires at least: 5.7
-Tested up to: 6.3
+Tested up to: 6.4
 Requires PHP: 7.0.0
 Author: Firmcatalyst, Vadim Volkov
@@ -16 +16 @@
 defined( 'ABSPATH' ) || exit;
 
-define( 'FCPLB_DEV', true );
+define( 'FCPLB_DEV', false );
 define( 'FCPLB_VER', get_file_data( __FILE__, [ 'ver' => 'Version' ] )[ 'ver' ] . ( FCPLB_DEV ? time() : '' ) );
 
@@ -35 +35 @@
 
     // defer the script loading
-    add_filter('script_loader_tag', function ($tag, $handle) {
-        if ( $handle !== $loader_name || strpos( $tag, 'defer ' ) !== false) { return $tag; }
-        return str_replace( ' src', ' defer src', $tag );
+    add_filter('script_loader_tag', function ($tag, $handle) use ($loader_name) {
+        if ( $handle !== $loader_name ) { return $tag; }
+        return str_replace( [' defer', ' src'], [' ', ' defer src'], $tag );
     }, 10, 2);
     

fcp-lightest-lightbox/trunk/loader.js

@@ -1 +1 @@
 'use strict';
-(function(){let a=setInterval(function(){if(document.readyState!=='complete'&&document.readyState!=='interactive'){return}clearInterval(a);a=null; // soft wait for dom ready
 
-    // check if the preferences exist & can load the lightbox
-    const p = window.fcp_lightbox;
-    if ( !p || !p.selector || !document.querySelector( p.selector ) ) { return }
+// wait for DOM
+(function(){let i=setInterval(function(){let r=document.readyState;if(r!=='complete'&&r!=='interactive'){return}clearInterval(i);i=null;r=null;
+
+    const { selector, loader, dev, ver } = window.fcp_lightbox;
+
+    // no images found
+    if ( !document.querySelector( selector ) ) { return }
     
-    // append the script
-    const d = document,
-          body = d.querySelector( 'body' );
+    // get the url of the main script
+    const self = document.getElementById( loader ),
+          self_url = new URL( self.src ),
+          load_url = new URL( 'assets/script'+(dev ? '' : '.min')+'.js'+'?'+ver, self_url ).href;
 
-    const script = d.createElement( 'script' );
+    // load the main script
+    const script = document.createElement( 'script' );
     Object.assign( script, {
-            'id':'fcp-lightbox-js', 'type':'text/javascript', 'async':true, 
-            'src':p.path + 'assets/script' + (p.dev ? '' : '.min') + '.js?' + p.ver
+            id: loader.replace( '-loader', '' ),
+            type: 'text/javascript',
+            defer: true, 
+            src: load_url
     });
-    body.append( script );
+    self.parentElement.insertBefore( script, self );
 
-},300)})();
+},100)})();

fcp-lightest-lightbox/trunk/readme.txt

@@ -3 +3 @@
 Tags: lightbox, gallery, photography, images
 Requires at least: 5.7
-Tested up to: 6.3
+Tested up to: 6.4
 Requires PHP: 7.0.0
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 Author: Firmcatalyst, Vadim Volkov
 Author URI: https://firmcatalyst.com