Changeset 50367

Timestamp:

02/16/2021 08:23:19 PM (6 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Further fix jQuery deprecations in WordPress core.

This addresses JQMIGRATE warnings in some admin files and the Thickbox library.

Follow-up to [50001], [50270].

Props bordoni, poena.
See #51812.

Location:

trunk/src/js

Files:

• _enqueues/admin/application-passwords.js (modified) (5 diffs)
• _enqueues/admin/privacy-tools.js (modified) (2 diffs)
• _enqueues/admin/site-health.js (modified) (1 diff)
• _enqueues/admin/xfn.js (modified) (1 diff)
• _enqueues/lib/pointer.js (modified) (1 diff)
• _enqueues/vendor/thickbox/thickbox.js (modified) (14 diffs)
• media/views/attachment/details.js (modified) (4 diffs)

trunk/src/js/_enqueues/admin/application-passwords.js

@@ -26 +26 @@
 
                 if ( 0 === name.length ) {
-                        $newAppPassField.focus();
+                        $newAppPassField.trigger( 'focus' );
                         return;
                 }
@@ -61 +61 @@
                                 password: response.password
                         } ) );
-                        $( '.new-application-password-notice' ).focus();
+                        $( '.new-application-password-notice' ).trigger( 'focus' );
 
                         $appPassTbody.prepend( tmplAppPassRow( response ) );
@@ -106 +106 @@
                                 $tr.remove();
 
-                                addNotice( wp.i18n.__( 'Application password revoked.' ), 'success' ).focus();
+                                addNotice( wp.i18n.__( 'Application password revoked.' ), 'success' ).trigger( 'focus' );
                         }
                 } ).fail( handleErrorResponse );
@@ -134 +134 @@
                                 $appPassTwrapper.hide();
 
-                                addNotice( wp.i18n.__( 'All application passwords revoked.' ), 'success' ).focus();
+                                addNotice( wp.i18n.__( 'All application passwords revoked.' ), 'success' ).trigger( 'focus' );
                         }
                 } ).fail( handleErrorResponse );
@@ -146 +146 @@
                         $el.slideUp( 100, function () {
                                 $el.remove();
-                                $newAppPassField.focus();
+                                $newAppPassField.trigger( 'focus' );
                         } );
                 } );

trunk/src/js/_enqueues/admin/privacy-tools.js

@@ -73 +73 @@
                 $rowActions.addClass( 'processing' );
 
-                $action.blur();
+                $action.trigger( 'blur' );
                 clearResultsAfterRow( $requestRow );
                 setExportProgress( 0 );
@@ -178 +178 @@
                 $rowActions.addClass( 'processing' );
 
-                $action.blur();
+                $action.trigger( 'blur' );
                 clearResultsAfterRow( $requestRow );
                 setErasureProgress( 0 );

trunk/src/js/_enqueues/admin/site-health.js

@@ -25 +25 @@
                 e.clearSelection();
                 // Handle ClipboardJS focus bug, see https://github.com/zenorocha/clipboard.js/issues/680
-                triggerElement.focus();
+                triggerElement.trigger( 'focus' );
 
                 // Show success visual feedback.

trunk/src/js/_enqueues/admin/xfn.js

@@ -7 +7 @@
 jQuery( document ).ready(function( $ ) {
         $( '#link_rel' ).prop( 'readonly', true );
-        $( '#linkxfndiv input' ).bind( 'click keyup', function() {
+        $( '#linkxfndiv input' ).on( 'click keyup', function() {
                 var isMe = $( '#me' ).is( ':checked' ), inputs = '';
                 $( 'input.valinp' ).each( function() {

trunk/src/js/_enqueues/lib/pointer.js

@@ -20 +20 @@
                                 var button = $('<a class="close" href="#"></a>').text( wp.i18n.__( 'Dismiss' ) );
 
-                                return button.bind( 'click.pointer', function(e) {
+                                return button.on( 'click.pointer', function(e) {
                                         e.preventDefault();
                                         t.element.pointer('close');

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

@@ -36 +36 @@
         var g = this.rel || false;
         tb_show(t,a,g);
-        this.blur();
+        this.trigger( 'blur' );
         return false;
 }
@@ -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").click(tb_remove);
+                                jQuery("#TB_overlay").trigger( '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").click(tb_remove);
+                                jQuery("#TB_overlay").trigger( '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").click(tb_remove);
+                        jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
 
                         if (!(TB_PrevHTML === "")) {
                                 function goPrev(){
-                                        if(jQuery(document).unbind("click",goPrev)){jQuery(document).unbind("click",goPrev);}
+                                        if(jQuery(document).off("click",goPrev)){jQuery(document).off("click",goPrev);}
                                         jQuery("#TB_window").remove();
                                         jQuery("body").append("<div id='TB_window'></div>");
@@ -152 +152 @@
                                         return false;
                                 }
-                                jQuery("#TB_prev").click(goPrev);
+                                jQuery("#TB_prev").trigger( 'click', goPrev );
                         }
 
@@ -162 +162 @@
                                         return false;
                                 }
-                                jQuery("#TB_next").click(goNext);
-
-                        }
-
-                        jQuery(document).bind('keydown.thickbox', function(e){
+                                jQuery("#TB_next").trigger( 'click', goNext );
+
+                        }
+
+                        jQuery(document).on('keydown.thickbox', function(e){
                                 if ( e.which == 27 ){ // close
                                         tb_remove();
@@ -172 +172 @@
                                 } else if ( e.which == 190 ){ // display previous image
                                         if(!(TB_NextHTML == "")){
-                                                jQuery(document).unbind('thickbox');
+                                                jQuery(document).off('thickbox');
                                                 goNext();
                                         }
                                 } else if ( e.which == 188 ){ // display next image
                                         if(!(TB_PrevHTML == "")){
-                                                jQuery(document).unbind('thickbox');
+                                                jQuery(document).off('thickbox');
                                                 goPrev();
                                         }
@@ -186 +186 @@
                         tb_position();
                         jQuery("#TB_load").remove();
-                        jQuery("#TB_ImageOff").click(tb_remove);
+                        jQuery("#TB_ImageOff").trigger( 'click', tb_remove );
                         jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show
                         };
@@ -207 +207 @@
                                                 jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
                                         }else{//iframe modal
-                                        jQuery("#TB_overlay").unbind();
+                                        jQuery("#TB_overlay").off();
                                                 jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
                                         }
@@ -215 +215 @@
                                                 jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
                                                 }else{//ajax modal
-                                                jQuery("#TB_overlay").unbind();
+                                                jQuery("#TB_overlay").off();
                                                 jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
                                                 }
@@ -226 +226 @@
                         }
 
-                        jQuery("#TB_closeWindowButton").click(tb_remove);
+                        jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
 
                                 if(url.indexOf('TB_inline') != -1){
                                         jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children());
-                                        jQuery("#TB_window").bind('tb_unload', function () {
+                                        jQuery("#TB_window").on('tb_unload', function () {
                                                 jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished
                                         });
@@ -254 +254 @@
 
                 if(!params['modal']){
-                        jQuery(document).bind('keydown.thickbox', function(e){
+                        jQuery(document).on('keydown.thickbox', function(e){
                                 if ( e.which == 27 ){ // close
                                         tb_remove();
@@ -269 +269 @@
                  */
                 if ( $closeBtn.find( '.tb-close-icon' ).is( ':visible' ) ) {
-                        $closeBtn.focus();
+                        $closeBtn.trigger( 'focus' );
                 }
 
@@ -284 +284 @@
 
 function tb_remove() {
-        jQuery("#TB_imageOff").unbind("click");
-        jQuery("#TB_closeWindowButton").unbind("click");
+        jQuery("#TB_imageOff").off("click");
+        jQuery("#TB_closeWindowButton").off("click");
         jQuery( '#TB_window' ).fadeOut( 'fast', function() {
-                jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).unbind().remove();
+                jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).off().remove();
                 jQuery( 'body' ).trigger( 'thickbox:removed' );
         });
@@ -296 +296 @@
                 jQuery("html").css("overflow","");
         }
-        jQuery(document).unbind('.thickbox');
+        jQuery(document).off('.thickbox');
         return false;
 }

trunk/src/js/media/views/attachment/details.js

@@ -49 +49 @@
                         event.clearSelection();
                         // Handle ClipboardJS focus bug, see https://github.com/zenorocha/clipboard.js/issues/680
-                        triggerElement.focus();
+                        triggerElement.trigger( 'focus' );
 
                         // Show success visual feedback.
@@ -106 +106 @@
         moveFocus: function() {
                 if ( this.previousAttachment.length ) {
-                        this.previousAttachment.focus();
+                        this.previousAttachment.trigger( 'focus' );
                         return;
                 }
 
                 if ( this.nextAttachment.length ) {
-                        this.nextAttachment.focus();
+                        this.nextAttachment.trigger( 'focus' );
                         return;
                 }
@@ -117 +117 @@
                 // Fallback: move focus to the "Select Files" button in the media modal.
                 if ( this.controller.uploader && this.controller.uploader.$browser ) {
-                        this.controller.uploader.$browser.focus();
+                        this.controller.uploader.$browser.trigger( 'focus' );
                         return;
                 }
@@ -134 +134 @@
                 $( '.media-frame' )
                         .attr( 'tabindex', '-1' )
-                        .focus();
+                        .trigger( 'focus' );
         },