Changeset 50410

Timestamp:

02/23/2021 10:52:12 AM (6 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Correct click event handling in the Thickbox library.

Follow-up to [50367], [50383].

Props peterwilsoncc.
Fixes #52618. See #51812.

File:

• trunk/src/js/_enqueues/vendor/thickbox/thickbox.js (modified) (6 diffs)

trunk/src/js/_enqueues/vendor/thickbox/thickbox.js

@@ -50 +50 @@
                         if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
                                 jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
-                                jQuery("#TB_overlay").trigger( 'click', tb_remove );
+                                jQuery("#TB_overlay").on( 'click', tb_remove );
                         }
                 }else{//all others
                         if(document.getElementById("TB_overlay") === null){
                                 jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
-                                jQuery("#TB_overlay").trigger( 'click', tb_remove );
+                                jQuery("#TB_overlay").on( 'click', tb_remove );
                                 jQuery( 'body' ).addClass( 'modal-open' );
                         }
@@ -142 +142 @@
                         jQuery("#TB_window").append("<a href='' id='TB_ImageOff'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div>");
 
-                        jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
+                        jQuery("#TB_closeWindowButton").on( 'click', tb_remove );
 
                         if (!(TB_PrevHTML === "")) {
@@ -152 +152 @@
                                         return false;
                                 }
-                                jQuery("#TB_prev").trigger( 'click', goPrev );
+                                jQuery("#TB_prev").on( 'click', goPrev );
                         }
 
@@ -162 +162 @@
                                         return false;
                                 }
-                                jQuery("#TB_next").trigger( 'click', goNext );
+                                jQuery("#TB_next").on( 'click', goNext );
 
                         }
@@ -186 +186 @@
                         tb_position();
                         jQuery("#TB_load").remove();
-                        jQuery("#TB_ImageOff").trigger( 'click', tb_remove );
+                        jQuery("#TB_ImageOff").on( 'click', tb_remove );
                         jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show
                         };
@@ -226 +226 @@
                         }
 
-                        jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
+                        jQuery("#TB_closeWindowButton").on( 'click', tb_remove );
 
                                 if(url.indexOf('TB_inline') != -1){