Fixed #1608 - Click event delegation did not work properly

Author: fancyapps

dist/jquery.fancybox.js

@@ -1,5 +1,5 @@
 // ==================================================
-// fancyBox v3.1.20
+// fancyBox v3.1.21
 //
 // Licensed GPLv3 for open source use
 // or fancyBox Commercial License for commercial use
@@ -2629,7 +2629,7 @@
 
     $.fancybox = {
 
-        version  : "3.1.20",
+        version  : "3.1.21",
         defaults : defaults,
 
 
@@ -2906,13 +2906,19 @@
     function _run( e ) {
         var target	= e.currentTarget,
             opts	= e.data ? e.data.options : {},
-            items	= e.data ? e.data.items : [],
+            items	= opts.selector ? $( opts.selector ) : ( e.data ? e.data.items : [] ),
             value	= $(target).attr( 'data-fancybox' ) || '',
-            index	= 0;
+            index	= 0,
+            active  = $.fancybox.getInstance();
 
         e.preventDefault();
         e.stopPropagation();
 
+        // Avoid opening multiple times
+        if ( active && active.current.opts.$orig.is( target ) ) {
+            return;
+        }
+
         // Get all related items and find index for clicked one
         if ( value ) {
             items = items.length ? items.filter( '[data-fancybox="' + value + '"]' ) : $( '[data-fancybox="' + value + '"]' );
@@ -2944,7 +2950,6 @@
         if ( selector ) {
 
             $( 'body' ).off( 'click.fb-start', selector ).on( 'click.fb-start', selector, {
-                items   : $( selector ),
                 options : options
             }, _run );
 

dist/jquery.fancybox.min.js

@@ -1,7 +1,7 @@
 {
   "name": "@fancyapps/fancybox",
   "description": "Touch enabled, responsive and fully customizable jQuery lightbox script",
-  "version": "3.1.20",
+  "version": "3.1.21",
   "homepage": "http://fancyapps.com/fancybox/",
   "main": "./dist/jquery.fancybox.min.js",
   "author": "fancyApps",

package.json

@@ -2896,13 +2896,19 @@
     function _run( e ) {
         var target	= e.currentTarget,
             opts	= e.data ? e.data.options : {},
-            items	= e.data ? e.data.items : [],
+            items	= opts.selector ? $( opts.selector ) : ( e.data ? e.data.items : [] ),
             value	= $(target).attr( 'data-fancybox' ) || '',
-            index	= 0;
+            index	= 0,
+            active  = $.fancybox.getInstance();
 
         e.preventDefault();
         e.stopPropagation();
 
+        // Avoid opening multiple times
+        if ( active && active.current.opts.$orig.is( target ) ) {
+            return;
+        }
+
         // Get all related items and find index for clicked one
         if ( value ) {
             items = items.length ? items.filter( '[data-fancybox="' + value + '"]' ) : $( '[data-fancybox="' + value + '"]' );
@@ -2934,7 +2940,6 @@
         if ( selector ) {
 
             $( 'body' ).off( 'click.fb-start', selector ).on( 'click.fb-start', selector, {
-                items   : $( selector ),
                 options : options
             }, _run );