From cc0714f612d0ce07432a8466b2220da60c8cf346 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 14:59:17 -0700
Subject: [PATCH 01/15] Replace Jquery.isFunction() except in 3rd party assets

---
 assets/js/frontend/single-product.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index ad1e5407a46..b93faefc3cb 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -101,8 +101,8 @@ jQuery( function( $ ) {
 		$target.data( 'product_gallery', this );
 
 		// Pick functionality to initialize...
-		this.flexslider_enabled = $.isFunction( $.fn.flexslider ) && wc_single_product_params.flexslider_enabled;
-		this.zoom_enabled       = $.isFunction( $.fn.zoom ) && wc_single_product_params.zoom_enabled;
+		this.flexslider_enabled = 'function' === typeof $.fn.flexslider && wc_single_product_params.flexslider_enabled;
+		this.zoom_enabled       = 'function' === typeof $.fn.zoom && wc_single_product_params.zoom_enabled;
 		this.photoswipe_enabled = typeof PhotoSwipe !== 'undefined' && wc_single_product_params.photoswipe_enabled;
 
 		// ...also taking args into account.

From 80a8d66106941fb567dd64a63a86bc18366f3223 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:00:14 -0700
Subject: [PATCH 02/15] Replace jQuery.submit()

---
 assets/js/admin/meta-boxes-product-variation.js | 4 ++--
 assets/js/admin/wc-setup.js                     | 6 +++---
 assets/js/frontend/woocommerce.js               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index dc45f7a2012..1dfc880e598 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -547,9 +547,9 @@ jQuery( function( $ ) {
 				callerid = postForm.data( 'callerid' );
 
 			if ( 'publish' === callerid ) {
-				postForm.append('<input type="hidden" name="publish" value="1" />').submit();
+				postForm.append('<input type="hidden" name="publish" value="1" />').trigger( 'submit' );
 			} else {
-				postForm.append('<input type="hidden" name="save-post" value="1" />').submit();
+				postForm.append('<input type="hidden" name="save-post" value="1" />').trigger( 'submit' );
 			}
 		},
 
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index 1484fda1f7b..2f846e60e37 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -37,7 +37,7 @@ jQuery( function( $ ) {
 		} );
 
 		$( document.body ).on( 'wc_backbone_modal_response', function() {
-			form.unbind( 'submit' ).submit();
+			form.unbind( 'submit' ).trigger( 'submit' );
 		} );
 
 		$( '#wc_tracker_checkbox_dialog' ).on( 'change', function( e ) {
@@ -46,7 +46,7 @@ jQuery( function( $ ) {
 		} );
 
 		$( '#wc_tracker_submit' ).on( 'click', function () {
-			form.unbind( 'submit' ).submit();
+			form.unbind( 'submit' ).trigger( 'submit' );
 		} );
 
 		return true;
@@ -182,7 +182,7 @@ jQuery( function( $ ) {
 	} );
 
 	function submitActivateForm() {
-		$( 'form.activate-jetpack' ).submit();
+		$( 'form.activate-jetpack' ).trigger( 'submit' );
 	}
 
 	function waitForJetpackInstall() {
diff --git a/assets/js/frontend/woocommerce.js b/assets/js/frontend/woocommerce.js
index f09329fe6a4..169ac858226 100644
--- a/assets/js/frontend/woocommerce.js
+++ b/assets/js/frontend/woocommerce.js
@@ -2,7 +2,7 @@
 jQuery( function( $ ) {
 	// Orderby
 	$( '.woocommerce-ordering' ).on( 'change', 'select.orderby', function() {
-		$( this ).closest( 'form' ).submit();
+		$( this ).closest( 'form' ).trigger( 'submit' );
 	});
 
 	// Target quantity inputs on product pages

From a67def78de3eb2aef694043f4f5fdb144270ae6a Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:00:55 -0700
Subject: [PATCH 03/15] Replace jQuery.click()

---
 assets/js/admin/meta-boxes-order.js             |  4 ++--
 assets/js/admin/meta-boxes-product-variation.js |  2 +-
 assets/js/admin/meta-boxes-product.js           |  4 ++--
 assets/js/admin/meta-boxes.js                   |  2 +-
 assets/js/admin/wc-setup.js                     |  2 +-
 assets/js/frontend/add-payment-method.js        |  2 +-
 assets/js/frontend/single-product.js            | 10 +++++-----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index dc5ccf52890..5973cc6a87f 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -158,7 +158,7 @@ jQuery( function ( $ ) {
 
 		change_customer_user: function() {
 			if ( ! $( '#_billing_country' ).val() ) {
-				$( 'a.edit_address' ).click();
+				$( 'a.edit_address' ).trigger( 'click' );
 				wc_meta_boxes_order.load_billing( true );
 				wc_meta_boxes_order.load_shipping( true );
 			}
@@ -643,7 +643,7 @@ jQuery( function ( $ ) {
 			$( this ).closest( 'tr' ).find( '.view' ).hide();
 			$( this ).closest( 'tr' ).find( '.edit' ).show();
 			$( this ).hide();
-			$( 'button.add-line-item' ).click();
+			$( 'button.add-line-item' ).trigger( 'click' );
 			$( 'button.cancel-action' ).attr( 'data-reload', true );
 			window.wcTracks.recordEvent( 'order_edit_edit_item_click', {
 				order_id: woocommerce_admin_meta_boxes.post_id,
diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index 1dfc880e598..9329e1fb41e 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -104,7 +104,7 @@ jQuery( function( $ ) {
 						date_to   = $( '.sale_price_dates_to', $el ).val();
 
 					if ( '' !== date_from || '' !== date_to ) {
-						$( 'a.sale_schedule', $el ).click();
+						$( 'a.sale_schedule', $el ).trigger( 'click' );
 					}
 				});
 
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index f124a581224..3c48ef6770e 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -113,7 +113,7 @@ jQuery( function( $ ) {
 
 		show_and_hide_panels();
 
-		$( 'ul.wc-tabs li:visible' ).eq( 0 ).find( 'a' ).click();
+		$( 'ul.wc-tabs li:visible' ).eq( 0 ).find( 'a' ).trigger( 'click' );
 
 		$( document.body ).trigger( 'woocommerce-product-type-change', select_val, $( this ) );
 
@@ -335,7 +335,7 @@ jQuery( function( $ ) {
 
 			attribute_row_indexes();
 
-			$attributes.find( '.woocommerce_attribute' ).last().find( 'h3' ).click();
+			$attributes.find( '.woocommerce_attribute' ).last().find( 'h3' ).trigger( 'click' );
 
 			$wrapper.unblock();
 
diff --git a/assets/js/admin/meta-boxes.js b/assets/js/admin/meta-boxes.js
index ccc9d87648c..1f82968994f 100644
--- a/assets/js/admin/meta-boxes.js
+++ b/assets/js/admin/meta-boxes.js
@@ -32,7 +32,7 @@ jQuery( function ( $ ) {
 			$( $( this ).attr( 'href' ) ).show();
 		});
 		$( 'div.panel-wrap' ).each( function() {
-			$( this ).find( 'ul.wc-tabs li' ).eq( 0 ).find( 'a' ).click();
+			$( this ).find( 'ul.wc-tabs li' ).eq( 0 ).find( 'a' ).trigger( 'click' );
 		});
 	}).trigger( 'wc-init-tabbed-panels' );
 
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index 2f846e60e37..1a0f9b0b3e4 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -121,7 +121,7 @@ jQuery( function( $ ) {
 			$focused = $( document.activeElement );
 
 		if ( $focused.is( '.wc-wizard-service-toggle, .wc-wizard-service-enable' ) && ( 13 === code || 32 === code ) ) {
-			$focused.find( ':input' ).click();
+			$focused.find( ':input' ).trigger( 'click' );
 		}
 	} );
 
diff --git a/assets/js/frontend/add-payment-method.js b/assets/js/frontend/add-payment-method.js
index 1642155a77a..d824ce86a39 100644
--- a/assets/js/frontend/add-payment-method.js
+++ b/assets/js/frontend/add-payment-method.js
@@ -24,7 +24,7 @@ jQuery( function( $ ) {
 	})
 
 	// Trigger initial click
-	.find( 'input[name=payment_method]:checked' ).click();
+	.find( 'input[name=payment_method]:checked' ).trigger( 'click' );
 
 	$( '#add_payment_method' ).submit( function() {
 		$( '#add_payment_method' ).block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index b93faefc3cb..fee12d826d8 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -16,13 +16,13 @@ jQuery( function( $ ) {
 			var $tabs = $( this ).find( '.wc-tabs, ul.tabs' ).first();
 
 			if ( hash.toLowerCase().indexOf( 'comment-' ) >= 0 || hash === '#reviews' || hash === '#tab-reviews' ) {
-				$tabs.find( 'li.reviews_tab a' ).click();
+				$tabs.find( 'li.reviews_tab a' ).trigger( 'click' );
 			} else if ( url.indexOf( 'comment-page-' ) > 0 || url.indexOf( 'cpage=' ) > 0 ) {
-				$tabs.find( 'li.reviews_tab a' ).click();
+				$tabs.find( 'li.reviews_tab a' ).trigger( 'click' );
 			} else if ( hash === '#tab-additional_information' ) {
-				$tabs.find( 'li.additional_information_tab a' ).click();
+				$tabs.find( 'li.additional_information_tab a' ).trigger( 'click' );
 			} else {
-				$tabs.find( 'li:first a' ).click();
+				$tabs.find( 'li:first a' ).trigger( 'click' );
 			}
 		} )
 		.on( 'click', '.wc-tabs li a, ul.tabs li a', function( e ) {
@@ -39,7 +39,7 @@ jQuery( function( $ ) {
 		} )
 		// Review link
 		.on( 'click', 'a.woocommerce-review-link', function() {
-			$( '.reviews_tab a' ).click();
+			$( '.reviews_tab a' ).trigger( 'click' );
 			return true;
 		} )
 		// Star ratings for comments

From 61c4e20863ec1dfce21b1c8d0596314a36708371 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:04:26 -0700
Subject: [PATCH 04/15] replace jQuery..bind except in 3rd party assets

---
 .../js/admin/meta-boxes-product-variation.js  |  2 +-
 assets/js/admin/meta-boxes-product.js         |  2 +-
 assets/js/admin/reports.js                    |  2 +-
 assets/js/admin/wc-product-export.js          |  2 +-
 assets/js/admin/wc-product-import.js          |  2 +-
 assets/js/admin/wc-setup.js                   |  2 +-
 assets/js/admin/woocommerce_admin.js          |  2 +-
 assets/js/frontend/add-to-cart-variation.js   |  8 +++---
 assets/js/frontend/add-to-cart.js             |  4 +--
 assets/js/frontend/address-i18n.js            |  2 +-
 assets/js/frontend/cart-fragments.js          |  2 +-
 assets/js/frontend/cart.js                    | 26 +++++++++----------
 assets/js/frontend/checkout.js                |  4 +--
 assets/js/frontend/country-select.js          |  2 +-
 assets/js/frontend/single-product.js          | 14 +++++-----
 assets/js/frontend/tokenization-form.js       | 10 +++----
 16 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index 9329e1fb41e..66966d3c629 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -346,7 +346,7 @@ jQuery( function( $ ) {
 
 			postForm.on( 'submit', this.save_on_submit );
 
-			$( 'input:submit', postForm ).bind( 'click keypress', function() {
+			$( 'input:submit', postForm ).on( 'click keypress', function() {
 				postForm.data( 'callerid', this.id );
 			});
 
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index 3c48ef6770e..ee696e527cd 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -20,7 +20,7 @@ jQuery( function( $ ) {
 	});
 
 	// Prevent enter submitting post form.
-	$( '#upsell_product_data' ).bind( 'keypress', function( e ) {
+	$( '#upsell_product_data' ).on( 'keypress', function( e ) {
 		if ( e.keyCode === 13 ) {
 			return false;
 		}
diff --git a/assets/js/admin/reports.js b/assets/js/admin/reports.js
index 34ec4ff2be6..8f3857aef01 100644
--- a/assets/js/admin/reports.js
+++ b/assets/js/admin/reports.js
@@ -10,7 +10,7 @@ jQuery(function( $ ) {
 	var prev_data_index = null;
 	var prev_series_index = null;
 
-	$( '.chart-placeholder' ).bind( 'plothover', function ( event, pos, item ) {
+	$( '.chart-placeholder' ).on( 'plothover', function ( event, pos, item ) {
 		if ( item ) {
 			if ( prev_data_index !== item.dataIndex || prev_series_index !== item.seriesIndex ) {
 				prev_data_index   = item.dataIndex;
diff --git a/assets/js/admin/wc-product-export.js b/assets/js/admin/wc-product-export.js
index 8e2dc3546e5..b33ad76d56a 100644
--- a/assets/js/admin/wc-product-export.js
+++ b/assets/js/admin/wc-product-export.js
@@ -11,7 +11,7 @@
 		this.$form.find('.woocommerce-exporter-progress').val( 0 );
 
 		// Methods.
-		this.processStep = this.processStep.bind( this );
+		this.processStep = this.processStep.on( this );
 
 		// Events.
 		$form.on( 'submit', { productExportForm: this }, this.onSubmit );
diff --git a/assets/js/admin/wc-product-import.js b/assets/js/admin/wc-product-import.js
index 645f11b5912..5222ac4c13f 100644
--- a/assets/js/admin/wc-product-import.js
+++ b/assets/js/admin/wc-product-import.js
@@ -23,7 +23,7 @@
 		// Initial state.
 		this.$form.find('.woocommerce-importer-progress').val( 0 );
 
-		this.run_import = this.run_import.bind( this );
+		this.run_import = this.run_import.on( this );
 
 		// Start importing.
 		this.run_import();
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index 1a0f9b0b3e4..fffe5168a0f 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -252,7 +252,7 @@ jQuery( function( $ ) {
 			bySlug[ slug ].find( 'a' )
 				.on( 'mouseenter mouseleave', ( function( $hover, event ) {
 					$hover.toggleClass( 'plugin-install-source', 'mouseenter' === event.type );
-				} ).bind( null, hover ? $el.closest( hover ) : $el ) );
+				} ).on( null, hover ? $el.closest( hover ) : $el ) );
 		}
 	}
 
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index e023ab8ef08..7932d1ea430 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -250,7 +250,7 @@
 		var shifted    = false;
 		var hasFocus   = false;
 
-		$( document.body ).bind( 'keyup keydown', function( e ) {
+		$( document.body ).on( 'keyup keydown', function( e ) {
 			shifted    = e.shiftKey;
 			controlled = e.ctrlKey || e.metaKey;
 		});
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index 2dd3c209945..dacd3185a85 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -22,10 +22,10 @@
 		self.$form.off( '.wc-variation-form' );
 
 		// Methods.
-		self.getChosenAttributes    = self.getChosenAttributes.bind( self );
-		self.findMatchingVariations = self.findMatchingVariations.bind( self );
-		self.isMatch                = self.isMatch.bind( self );
-		self.toggleResetLink        = self.toggleResetLink.bind( self );
+		self.getChosenAttributes    = self.getChosenAttributes.on( self );
+		self.findMatchingVariations = self.findMatchingVariations.on( self );
+		self.isMatch                = self.isMatch.on( self );
+		self.toggleResetLink        = self.toggleResetLink.on( self );
 
 		// Events.
 		$form.on( 'click.wc-variation-form', '.reset_variations', { variationForm: self }, self.onReset );
diff --git a/assets/js/frontend/add-to-cart.js b/assets/js/frontend/add-to-cart.js
index e27baf072a4..d97cb7746e4 100644
--- a/assets/js/frontend/add-to-cart.js
+++ b/assets/js/frontend/add-to-cart.js
@@ -10,8 +10,8 @@ jQuery( function( $ ) {
 	 */
 	var AddToCartHandler = function() {
 		this.requests   = [];
-		this.addRequest = this.addRequest.bind( this );
-		this.run        = this.run.bind( this );
+		this.addRequest = this.addRequest.on( this );
+		this.run        = this.run.on( this );
 
 		$( document.body )
 			.on( 'click', '.add_to_cart_button', { addToCartHandler: this }, this.onAddToCart )
diff --git a/assets/js/frontend/address-i18n.js b/assets/js/frontend/address-i18n.js
index b66c0adae30..f71dd266e3b 100644
--- a/assets/js/frontend/address-i18n.js
+++ b/assets/js/frontend/address-i18n.js
@@ -32,7 +32,7 @@ jQuery( function( $ ) {
 
 	// Handle locale
 	$( document.body )
-		.bind( 'country_to_state_changing', function( event, country, wrapper ) {
+		.on( 'country_to_state_changing', function( event, country, wrapper ) {
 			var thisform = wrapper, thislocale;
 
 			if ( typeof locale[ country ] !== 'undefined' ) {
diff --git a/assets/js/frontend/cart-fragments.js b/assets/js/frontend/cart-fragments.js
index c5eef7b4c72..e70ad4ad36c 100644
--- a/assets/js/frontend/cart-fragments.js
+++ b/assets/js/frontend/cart-fragments.js
@@ -180,7 +180,7 @@ jQuery( function( $ ) {
 		wp.customize.widgetsPreview.WidgetPartial
 	);
 	if ( hasSelectiveRefresh ) {
-		wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
+		wp.customize.selectiveRefresh.on( 'partial-content-rendered', function() {
 			refresh_cart_fragment();
 		} );
 	}
diff --git a/assets/js/frontend/cart.js b/assets/js/frontend/cart.js
index 622c8eb1437..d2a8b55f0b8 100644
--- a/assets/js/frontend/cart.js
+++ b/assets/js/frontend/cart.js
@@ -152,9 +152,9 @@ jQuery( function( $ ) {
 		 */
 		init: function( cart ) {
 			this.cart                       = cart;
-			this.toggle_shipping            = this.toggle_shipping.bind( this );
-			this.shipping_method_selected   = this.shipping_method_selected.bind( this );
-			this.shipping_calculator_submit = this.shipping_calculator_submit.bind( this );
+			this.toggle_shipping            = this.toggle_shipping.on( this );
+			this.shipping_method_selected   = this.shipping_method_selected.on( this );
+			this.shipping_calculator_submit = this.shipping_calculator_submit.on( this );
 
 			$( document ).on(
 				'click',
@@ -261,16 +261,16 @@ jQuery( function( $ ) {
 		 * Initialize cart UI events.
 		 */
 		init: function() {
-			this.update_cart_totals    = this.update_cart_totals.bind( this );
-			this.input_keypress        = this.input_keypress.bind( this );
-			this.cart_submit           = this.cart_submit.bind( this );
-			this.submit_click          = this.submit_click.bind( this );
-			this.apply_coupon          = this.apply_coupon.bind( this );
-			this.remove_coupon_clicked = this.remove_coupon_clicked.bind( this );
-			this.quantity_update       = this.quantity_update.bind( this );
-			this.item_remove_clicked   = this.item_remove_clicked.bind( this );
-			this.item_restore_clicked  = this.item_restore_clicked.bind( this );
-			this.update_cart           = this.update_cart.bind( this );
+			this.update_cart_totals    = this.update_cart_totals.on( this );
+			this.input_keypress        = this.input_keypress.on( this );
+			this.cart_submit           = this.cart_submit.on( this );
+			this.submit_click          = this.submit_click.on( this );
+			this.apply_coupon          = this.apply_coupon.on( this );
+			this.remove_coupon_clicked = this.remove_coupon_clicked.on( this );
+			this.quantity_update       = this.quantity_update.on( this );
+			this.item_remove_clicked   = this.item_remove_clicked.on( this );
+			this.item_restore_clicked  = this.item_restore_clicked.on( this );
+			this.update_cart           = this.update_cart.on( this );
 
 			$( document ).on(
 				'wc_update_cart added_to_cart',
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 56ebd18a917..1918eb37dad 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -16,8 +16,8 @@ jQuery( function( $ ) {
 		$order_review: $( '#order_review' ),
 		$checkout_form: $( 'form.checkout' ),
 		init: function() {
-			$( document.body ).bind( 'update_checkout', this.update_checkout );
-			$( document.body ).bind( 'init_checkout', this.init_checkout );
+			$( document.body ).on( 'update_checkout', this.update_checkout );
+			$( document.body ).on( 'init_checkout', this.init_checkout );
 
 			// Payment methods
 			this.$checkout_form.on( 'click', 'input[name="payment_method"]', this.payment_method_selected );
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index eec0c962da3..e44a55947b2 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -70,7 +70,7 @@ jQuery( function( $ ) {
 
 		wc_country_select_select2();
 
-		$( document.body ).bind( 'country_to_state_changed', function() {
+		$( document.body ).on( 'country_to_state_changed', function() {
 			wc_country_select_select2();
 		});
 	}
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index fee12d826d8..852f68c84fe 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -118,13 +118,13 @@ jQuery( function( $ ) {
 		}
 
 		// Bind functions to this.
-		this.initFlexslider       = this.initFlexslider.bind( this );
-		this.initZoom             = this.initZoom.bind( this );
-		this.initZoomForTarget    = this.initZoomForTarget.bind( this );
-		this.initPhotoswipe       = this.initPhotoswipe.bind( this );
-		this.onResetSlidePosition = this.onResetSlidePosition.bind( this );
-		this.getGalleryItems      = this.getGalleryItems.bind( this );
-		this.openPhotoswipe       = this.openPhotoswipe.bind( this );
+		this.initFlexslider       = this.initFlexslider.on( this );
+		this.initZoom             = this.initZoom.on( this );
+		this.initZoomForTarget    = this.initZoomForTarget.on( this );
+		this.initPhotoswipe       = this.initPhotoswipe.on( this );
+		this.onResetSlidePosition = this.onResetSlidePosition.on( this );
+		this.getGalleryItems      = this.getGalleryItems.on( this );
+		this.openPhotoswipe       = this.openPhotoswipe.on( this );
 
 		if ( this.flexslider_enabled ) {
 			this.initFlexslider( args.flexslider );
diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js
index 3a5a8bffbad..9fde864d1c1 100644
--- a/assets/js/frontend/tokenization-form.js
+++ b/assets/js/frontend/tokenization-form.js
@@ -15,11 +15,11 @@ jQuery( function( $ ) {
 		}, wc_tokenization_form_params );
 
 		// Bind functions to this.
-		this.onDisplay             = this.onDisplay.bind( this );
-		this.hideForm              = this.hideForm.bind( this );
-		this.showForm              = this.showForm.bind( this );
-		this.showSaveNewCheckbox   = this.showSaveNewCheckbox.bind( this );
-		this.hideSaveNewCheckbox   = this.hideSaveNewCheckbox.bind( this );
+		this.onDisplay             = this.onDisplay.on( this );
+		this.hideForm              = this.hideForm.on( this );
+		this.showForm              = this.showForm.on( this );
+		this.showSaveNewCheckbox   = this.showSaveNewCheckbox.on( this );
+		this.hideSaveNewCheckbox   = this.hideSaveNewCheckbox.on( this );
 
 		// When a radio button is changed, make sure to show/hide our new CC info area.
 		this.$target.on(

From 0ccff4dda56397af993b4932990dc72e9b28171c Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:06:18 -0700
Subject: [PATCH 05/15] Repalce jQuery.focus() except in 3rd party assets

---
 assets/js/admin/api-keys.js          | 6 +++---
 assets/js/admin/backbone-modal.js    | 2 +-
 assets/js/admin/meta-boxes-coupon.js | 2 +-
 assets/js/admin/meta-boxes-order.js  | 4 ++--
 assets/js/admin/settings.js          | 4 ++--
 assets/js/admin/system-status.js     | 6 +++---
 assets/js/admin/woocommerce_admin.js | 2 +-
 assets/js/frontend/checkout.js       | 2 +-
 assets/js/frontend/country-select.js | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 4a5c0dd7ceb..035cd7e5675 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -53,7 +53,7 @@
 				.on( 'click', css_class, function( evt ) {
 					evt.preventDefault();
 					if ( ! document.queryCommandSupported( 'copy' ) ) {
-						$( css_class ).parent().find( 'input' ).focus().select();
+						$( css_class ).parent().find( 'input' ).trigger( 'focus' ).select();
 						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 					} else {
 						$( '#copy-error' ).text( '' );
@@ -69,10 +69,10 @@
 						'fadeIn':     50,
 						'fadeOut':    50,
 						'delay':      0
-					} ).focus();
+					} ).trigger( 'focus' );
 				} )
 				.on( 'aftercopyerror', css_class, function() {
-					$( css_class ).parent().find( 'input' ).focus().select();
+					$( css_class ).parent().find( 'input' ).trigger( 'focus' ).select();
 					$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 				} );
 		},
diff --git a/assets/js/admin/backbone-modal.js b/assets/js/admin/backbone-modal.js
index 63cca56422a..c1d92c4dab9 100644
--- a/assets/js/admin/backbone-modal.js
+++ b/assets/js/admin/backbone-modal.js
@@ -88,7 +88,7 @@
 			}).append( this.$el );
 
 			this.resizeContent();
-			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).focus();
+			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).trigger( 'focus' );
 
 			$( document.body ).trigger( 'init_tooltips' );
 
diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js
index 9fc82fd8bef..be7263a1d07 100644
--- a/assets/js/admin/meta-boxes-coupon.js
+++ b/assets/js/admin/meta-boxes-coupon.js
@@ -61,7 +61,7 @@ jQuery(function( $ ) {
 				);
 			}
 			$result = woocommerce_admin_meta_boxes_coupon.prefix + $result + woocommerce_admin_meta_boxes_coupon.suffix;
-			$coupon_code_field.focus().val( $result );
+			$coupon_code_field.trigger( 'focus' ).val( $result );
 			$coupon_code_label.addClass( 'screen-reader-text' );
 		}
 	};
diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index 5973cc6a87f..3e11bcb1476 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -1470,7 +1470,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		},
 
 		/**
@@ -1483,7 +1483,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		}
 	};
 
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index 88a924b8384..8665d52e20f 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -126,7 +126,7 @@
 			var moveBtn = $( this ),
 				$row    = moveBtn.closest( 'tr' );
 
-			moveBtn.focus();
+			moveBtn.trigger( 'focus' );
 
 			var isMoveUp = moveBtn.is( '.wc-move-up' ),
 				isMoveDown = moveBtn.is( '.wc-move-down' );
@@ -147,7 +147,7 @@
 				}
 			}
 
-			moveBtn.focus(); // Re-focus after the container was moved.
+			moveBtn.trigger( 'focus' ); // Re-focus after the container was moved.
 			moveBtn.closest( 'table' ).trigger( 'updateMoveButtons' );
 		} );
 
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index 9f066410b17..e3873958f33 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -68,7 +68,7 @@ jQuery( function ( $ ) {
 
 			try {
 				$( '#debug-report' ).slideDown();
-				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().select();
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).select();
 				$( this ).fadeOut();
 				return false;
 			} catch ( e ) {
@@ -100,7 +100,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).focus();
+			}).trigger( 'focus' );
 		},
 
 		/**
@@ -108,7 +108,7 @@ jQuery( function ( $ ) {
 		 */
 		copyFail: function() {
 			$( '.copy-error' ).removeClass( 'hidden' );
-			$( '#debug-report' ).find( 'textarea' ).focus().select();
+			$( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).select();
 		}
 	};
 
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index 7932d1ea430..67df55711a9 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -232,7 +232,7 @@
 		});
 		// Focus on inputs within the table if clicked instead of trying to sort.
 		$( '.wc_input_table.sortable tbody input' ).on( 'click', function() {
-			$( this ).focus();
+			$( this ).trigger( 'focus' );
 		} );
 
 		$( '.wc_input_table .remove_rows' ).on( 'click', function() {
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 1918eb37dad..90e05c913fc 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -582,7 +582,7 @@ jQuery( function( $ ) {
 		},
 		show_coupon_form: function() {
 			$( '.checkout_coupon' ).slideToggle( 400, function() {
-				$( '.checkout_coupon' ).find( ':input:eq(0)' ).focus();
+				$( '.checkout_coupon' ).find( ':input:eq(0)' ).trigger( 'focus' );
 			});
 			return false;
 		},
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index e44a55947b2..20ab4a64c66 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -62,7 +62,7 @@ jQuery( function( $ ) {
 
 				$( this )
 					.on( 'select2:select', function() {
-						$( this ).focus(); // Maintain focus after select https://github.com/select2/select2/issues/4384
+						$( this ).trigger( 'focus' ); // Maintain focus after select https://github.com/select2/select2/issues/4384
 					} )
 					.selectWoo( select2_args );
 			});

From adb2c6b86e3bc87c2f518b8cfd207f8f7ec4beb7 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:07:02 -0700
Subject: [PATCH 06/15] Replace jQuery.select()

---
 assets/js/admin/api-keys.js      | 4 ++--
 assets/js/admin/system-status.js | 4 ++--
 assets/js/admin/wc-clipboard.js  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 035cd7e5675..6ac852ff214 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -53,7 +53,7 @@
 				.on( 'click', css_class, function( evt ) {
 					evt.preventDefault();
 					if ( ! document.queryCommandSupported( 'copy' ) ) {
-						$( css_class ).parent().find( 'input' ).trigger( 'focus' ).select();
+						$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
 						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 					} else {
 						$( '#copy-error' ).text( '' );
@@ -72,7 +72,7 @@
 					} ).trigger( 'focus' );
 				} )
 				.on( 'aftercopyerror', css_class, function() {
-					$( css_class ).parent().find( 'input' ).trigger( 'focus' ).select();
+					$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
 					$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 				} );
 		},
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index e3873958f33..317625898c1 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -68,7 +68,7 @@ jQuery( function ( $ ) {
 
 			try {
 				$( '#debug-report' ).slideDown();
-				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).select();
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).trigger( 'select' );
 				$( this ).fadeOut();
 				return false;
 			} catch ( e ) {
@@ -108,7 +108,7 @@ jQuery( function ( $ ) {
 		 */
 		copyFail: function() {
 			$( '.copy-error' ).removeClass( 'hidden' );
-			$( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).select();
+			$( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).trigger( 'select' );
 		}
 	};
 
diff --git a/assets/js/admin/wc-clipboard.js b/assets/js/admin/wc-clipboard.js
index fc009d02041..8a2391213ae 100644
--- a/assets/js/admin/wc-clipboard.js
+++ b/assets/js/admin/wc-clipboard.js
@@ -17,7 +17,7 @@ function wcSetClipboard( data, $el ) {
 	}
 	var $temp_input = jQuery( '<textarea style="opacity:0">' );
 	jQuery( 'body' ).append( $temp_input );
-	$temp_input.val( data ).select();
+	$temp_input.val( data ).trigger( 'select' );
 
 	$el.trigger( 'beforecopy' );
 	try {

From 60f49f25d0f459ba7877a55b1b770a31303b8289 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:08:36 -0700
Subject: [PATCH 07/15] Replace jQuery.change()

---
 assets/js/admin/meta-boxes-coupon.js          |  2 +-
 assets/js/admin/meta-boxes-order.js           | 22 +++++++++----------
 .../js/admin/meta-boxes-product-variation.js  | 16 +++++++-------
 assets/js/admin/meta-boxes-product.js         | 20 ++++++++---------
 assets/js/admin/quick-edit.js                 |  4 ++--
 assets/js/admin/settings.js                   | 10 ++++-----
 assets/js/admin/users.js                      |  2 +-
 assets/js/admin/wc-product-export.js          |  2 +-
 assets/js/admin/wc-setup.js                   | 14 ++++++------
 assets/js/admin/wc-shipping-zone-methods.js   |  2 +-
 assets/js/admin/woocommerce_admin.js          |  8 +++----
 assets/js/frontend/add-to-cart-variation.js   | 12 +++++-----
 assets/js/frontend/checkout.js                | 12 +++++-----
 assets/js/frontend/country-select.js          |  2 +-
 assets/js/frontend/password-strength-meter.js |  2 +-
 15 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js
index be7263a1d07..594726739c0 100644
--- a/assets/js/admin/meta-boxes-coupon.js
+++ b/assets/js/admin/meta-boxes-coupon.js
@@ -12,7 +12,7 @@ jQuery(function( $ ) {
 		init: function() {
 			$( 'select#discount_type' )
 				.on( 'change', this.type_options )
-				.change();
+				.trigger( 'change' );
 
             this.insert_generate_coupon_code_button();
 			$( '.button.generate-coupon-code' ).on( 'click', this.generate_coupon_code );
diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index 3e11bcb1476..bc7c09a0115 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -90,7 +90,7 @@ jQuery( function ( $ ) {
 
 				$state.replaceWith( $newstate );
 
-				$newstate.show().selectWoo().hide().change();
+				$newstate.show().selectWoo().hide().trigger( 'change' );
 			} else {
 				$newstate = $( '<input type="text" />' )
 					.prop( 'id', input_id )
@@ -143,8 +143,8 @@ jQuery( function ( $ ) {
 			$this.parent().find( 'a' ).toggle();
 
 			if ( ! $country_input.val() ) {
-				$country_input.val( woocommerce_admin_meta_boxes_order.default_country ).change();
-				$state_input.val( woocommerce_admin_meta_boxes_order.default_state ).change();
+				$country_input.val( woocommerce_admin_meta_boxes_order.default_country ).trigger( 'change' );
+				$state_input.val( woocommerce_admin_meta_boxes_order.default_state ).trigger( 'change' );
 			}
 
 			$edit_address.show();
@@ -196,7 +196,7 @@ jQuery( function ( $ ) {
 					success: function( response ) {
 						if ( response && response.billing ) {
 							$.each( response.billing, function( key, data ) {
-								$( ':input#_billing_' + key ).val( data ).change();
+								$( ':input#_billing_' + key ).val( data ).trigger( 'change' );
 							});
 						}
 						$( 'div.edit_address' ).unblock();
@@ -238,7 +238,7 @@ jQuery( function ( $ ) {
 					success: function( response ) {
 						if ( response && response.billing ) {
 							$.each( response.shipping, function( key, data ) {
-								$( ':input#_shipping_' + key ).val( data ).change();
+								$( ':input#_shipping_' + key ).val( data ).trigger( 'change' );
 							});
 						}
 						$( 'div.edit_address' ).unblock();
@@ -253,7 +253,7 @@ jQuery( function ( $ ) {
 				$('.order_data_column :input[name^="_billing_"]').each( function() {
 					var input_name = $(this).attr('name');
 					input_name     = input_name.replace( '_billing_', '_shipping_' );
-					$( ':input#' + input_name ).val( $(this).val() ).change();
+					$( ':input#' + input_name ).val( $(this).val() ).trigger( 'change' );
 				});
 			}
 			return false;
@@ -1002,7 +1002,7 @@ jQuery( function ( $ ) {
 						'',
 						woocommerce_admin.mon_decimal_point
 					) )
-					.change();
+					.trigger( 'change' );
 			},
 
 			amount_changed: function() {
@@ -1032,7 +1032,7 @@ jQuery( function ( $ ) {
 					parseFloat( accounting.formatNumber( unit_total * refund_qty, woocommerce_admin_meta_boxes.rounding_precision, '' ) )
 						.toString()
 						.replace( '.', woocommerce_admin.mon_decimal_point )
-				).change();
+				).trigger( 'change' );
 
 				// Taxes
 				$( '.refund_line_tax', $row ).each( function() {
@@ -1054,9 +1054,9 @@ jQuery( function ( $ ) {
 							parseFloat( accounting.formatNumber( unit_total_tax * refund_qty, precision, '' ) )
 								.toString()
 								.replace( '.', woocommerce_admin.mon_decimal_point )
-						).change();
+						).trigger( 'change' );
 					} else {
-						$refund_line_total_tax.val( 0 ).change();
+						$refund_line_total_tax.val( 0 ).trigger( 'change' );
 					}
 				});
 
@@ -1401,7 +1401,7 @@ jQuery( function ( $ ) {
 				}
 
 				$( document.body ).trigger( 'wc-init-datepickers' );
-				$( '#grant_access_id' ).val( '' ).change();
+				$( '#grant_access_id' ).val( '' ).trigger( 'change' );
 				$( '.order_download_permissions' ).unblock();
 			});
 
diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index 66966d3c629..a157be435c6 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -19,7 +19,7 @@ jQuery( function( $ ) {
 				.on( 'click', 'h3 .sort', this.set_menu_order )
 				.on( 'reload', this.reload );
 
-			$( 'input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock' ).change();
+			$( 'input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock' ).trigger( 'change' );
 			$( '#woocommerce-product-data' ).on( 'woocommerce_variations_loaded', this.variations_loaded );
 			$( document.body ).on( 'woocommerce_variations_added', this.variation_added );
 		},
@@ -95,7 +95,7 @@ jQuery( function( $ ) {
 
 			if ( ! needsUpdate ) {
 				// Show/hide downloadable, virtual and stock fields
-				$( 'input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock', wrapper ).change();
+				$( 'input.variable_is_downloadable, input.variable_is_virtual, input.variable_manage_stock', wrapper ).trigger( 'change' );
 
 				// Open sale schedule fields when have some sale price date
 				$( '.woocommerce_variation', wrapper ).each( function( index, el ) {
@@ -138,7 +138,7 @@ jQuery( function( $ ) {
 						date   = $( this ).datepicker( 'getDate' );
 
 					dates.not( this ).datepicker( 'option', option, date );
-					$( this ).change();
+					$( this ).trigger( 'change' );
 				}
 			});
 
@@ -182,7 +182,7 @@ jQuery( function( $ ) {
 
 			if ( value != null ) {
 				// Set value, save changes and reload view
-				$menu_order.val( parseInt( value, 10 ) ).change();
+				$menu_order.val( parseInt( value, 10 ) ).trigger( 'change' );
 				wc_meta_boxes_product_variations_ajax.save_variations();
 			}
 		},
@@ -199,7 +199,7 @@ jQuery( function( $ ) {
 				$( '.variation_menu_order', el )
 					.val( parseInt( $( el )
 					.index( '.woocommerce_variations .woocommerce_variation' ), 10 ) + 1 + offset )
-					.change();
+					.trigger( 'change' );
 			});
 		}
 	};
@@ -262,7 +262,7 @@ jQuery( function( $ ) {
 
 			if ( $button.is( '.remove' ) ) {
 
-				$( '.upload_image_id', wc_meta_boxes_product_variations_media.setting_variation_image ).val( '' ).change();
+				$( '.upload_image_id', wc_meta_boxes_product_variations_media.setting_variation_image ).val( '' ).trigger( 'change' );
 				wc_meta_boxes_product_variations_media.setting_variation_image.find( 'img' ).eq( 0 )
 					.attr( 'src', woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src );
 				wc_meta_boxes_product_variations_media.setting_variation_image.find( '.upload_image_button' ).removeClass( 'remove' );
@@ -301,7 +301,7 @@ jQuery( function( $ ) {
 						.get( 'selection' ).first().toJSON(),
 						url = attachment.sizes && attachment.sizes.thumbnail ? attachment.sizes.thumbnail.url : attachment.url;
 
-					$( '.upload_image_id', wc_meta_boxes_product_variations_media.setting_variation_image ).val( attachment.id ).change();
+					$( '.upload_image_id', wc_meta_boxes_product_variations_media.setting_variation_image ).val( attachment.id ).trigger( 'change' );
 					wc_meta_boxes_product_variations_media.setting_variation_image.find( '.upload_image_button' ).addClass( 'remove' );
 					wc_meta_boxes_product_variations_media.setting_variation_image.find( 'img' ).eq( 0 ).attr( 'src', url );
 
@@ -977,7 +977,7 @@ jQuery( function( $ ) {
 		 * Set page
 		 */
 		set_page: function( page ) {
-			$( '.variations-pagenav .page-selector' ).val( page ).first().change();
+			$( '.variations-pagenav .page-selector' ).val( page ).first().trigger( 'change' );
 		},
 
 		/**
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index ee696e527cd..403db648a43 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -100,7 +100,7 @@ jQuery( function( $ ) {
 		var select_val = $( this ).val();
 
 		if ( 'variable' === select_val ) {
-			$( 'input#_manage_stock' ).change();
+			$( 'input#_manage_stock' ).trigger( 'change' );
 			$( 'input#_downloadable' ).prop( 'checked', false );
 			$( 'input#_virtual' ).removeAttr( 'checked' );
 		} else if ( 'grouped' === select_val ) {
@@ -117,7 +117,7 @@ jQuery( function( $ ) {
 
 		$( document.body ).trigger( 'woocommerce-product-type-change', select_val, $( this ) );
 
-	}).change();
+	}).trigger( 'change' );
 
 	$( 'input#_downloadable, input#_virtual' ).change( function() {
 		show_and_hide_panels();
@@ -165,7 +165,7 @@ jQuery( function( $ ) {
 
 		$( '.hide_if_' + product_type ).hide();
 
-		$( 'input#_manage_stock' ).change();
+		$( 'input#_manage_stock' ).trigger( 'change' );
 
 		// Hide empty panels/tabs after display.
 		$( '.woocommerce_options_panel' ).each( function() {
@@ -250,8 +250,8 @@ jQuery( function( $ ) {
 			$( 'p.stock_status_field:not( .hide_if_' + product_type + ' )' ).show();
 		}
 
-		$( 'input.variable_manage_stock' ).change();
-	}).change();
+		$( 'input.variable_manage_stock' ).trigger( 'change' );
+	}).trigger( 'change' );
 
 	// Date picker fields.
 	function date_picker_select( datepicker ) {
@@ -260,7 +260,7 @@ jQuery( function( $ ) {
 			date           = $( datepicker ).datepicker( 'getDate' );
 
 		$( otherDateField ).datepicker( 'option', option, date );
-		$( datepicker ).change();
+		$( datepicker ).trigger( 'change' );
 	}
 
 	$( '.sale_price_dates_fields' ).each( function() {
@@ -356,13 +356,13 @@ jQuery( function( $ ) {
 
 	$( '.product_attributes' ).on( 'click', 'button.select_all_attributes', function() {
 		$( this ).closest( 'td' ).find( 'select option' ).attr( 'selected', 'selected' );
-		$( this ).closest( 'td' ).find( 'select' ).change();
+		$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 		return false;
 	});
 
 	$( '.product_attributes' ).on( 'click', 'button.select_no_attributes', function() {
 		$( this ).closest( 'td' ).find( 'select option' ).removeAttr( 'selected' );
-		$( this ).closest( 'td' ).find( 'select' ).change();
+		$( this ).closest( 'td' ).find( 'select' ).trigger( 'change' );
 		return false;
 	});
 
@@ -436,7 +436,7 @@ jQuery( function( $ ) {
 					// Success.
 					$wrapper.find( 'select.attribute_values' )
 						.append( '<option value="' + response.term_id + '" selected="selected">' + response.name + '</option>' );
-					$wrapper.find( 'select.attribute_values' ).change();
+					$wrapper.find( 'select.attribute_values' ).trigger( 'change' );
 				}
 
 				$( '.product_attributes' ).unblock();
@@ -556,7 +556,7 @@ jQuery( function( $ ) {
 				}
 			});
 
-			file_path_field.val( file_path ).change();
+			file_path_field.val( file_path ).trigger( 'change' );
 		});
 
 		// Set post to 0 and set our custom type.
diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js
index ad5ccb01516..9562ab9e610 100644
--- a/assets/js/admin/quick-edit.js
+++ b/assets/js/admin/quick-edit.js
@@ -44,8 +44,8 @@ jQuery(
 				$( 'input[name="_width"]', '.inline-edit-row' ).val( width );
 				$( 'input[name="_height"]', '.inline-edit-row' ).val( height );
 
-				$( 'select[name="_shipping_class"] option:selected', '.inline-edit-row' ).attr( 'selected', false ).change();
-				$( 'select[name="_shipping_class"] option[value="' + shipping_class + '"]' ).attr( 'selected', 'selected' ).change();
+				$( 'select[name="_shipping_class"] option:selected', '.inline-edit-row' ).attr( 'selected', false ).trigger( 'change' );
+				$( 'select[name="_shipping_class"] option[value="' + shipping_class + '"]' ).attr( 'selected', 'selected' ).trigger( 'change' );
 
 				$( 'input[name="_stock"]', '.inline-edit-row' ).val( stock );
 				$( 'input[name="menu_order"]', '.inline-edit-row' ).val( menu_order );
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index 8665d52e20f..d0deee11e27 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -13,7 +13,7 @@
 				$( this ).closest('tr').next( 'tr' ).hide();
 				$( this ).closest('tr').next().next( 'tr' ).hide();
 			}
-		}).change();
+		}).trigger( 'change' );
 
 		// Ship Countries
 		$( 'select#woocommerce_ship_to_countries' ).change( function() {
@@ -22,7 +22,7 @@
 			} else {
 				$( this ).closest('tr').next( 'tr' ).hide();
 			}
-		}).change();
+		}).trigger( 'change' );
 
 		// Stock management
 		$( 'input#woocommerce_manage_stock' ).change( function() {
@@ -31,7 +31,7 @@
 			} else {
 				$( this ).closest('tbody').find( '.manage_stock_field' ).closest( 'tr' ).hide();
 			}
-		}).change();
+		}).trigger( 'change' );
 
 		// Color picker
 		$( '.colorpick' )
@@ -56,9 +56,9 @@
 					var original_value = $( this ).data( 'original-value' );
 
 					if ( original_value.match( /^\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/ ) ) {
-						$( this ).val( $( this ).data( 'original-value' ) ).change();
+						$( this ).val( $( this ).data( 'original-value' ) ).trigger( 'change' );
 					} else {
-						$( this ).val( '' ).change();
+						$( this ).val( '' ).trigger( 'change' );
 					}
 				}
 			});
diff --git a/assets/js/admin/users.js b/assets/js/admin/users.js
index 5659bd810cf..cb2b816604e 100644
--- a/assets/js/admin/users.js
+++ b/assets/js/admin/users.js
@@ -71,7 +71,7 @@ jQuery( function ( $ ) {
 
 				$state.replaceWith( $newstate );
 
-				$newstate.show().selectWoo().hide().change();
+				$newstate.show().selectWoo().hide().trigger( 'change' );
 			} else {
 				$newstate = $( '<input type="text" />' )
 					.prop( 'id', input_id )
diff --git a/assets/js/admin/wc-product-export.js b/assets/js/admin/wc-product-export.js
index b33ad76d56a..84a065214b2 100644
--- a/assets/js/admin/wc-product-export.js
+++ b/assets/js/admin/wc-product-export.js
@@ -93,7 +93,7 @@
 
 		if ( -1 !== $.inArray( 'variation', $( this ).val() ) ) {
 			exportCategory.closest( 'tr' ).hide();
-			exportCategory.val( '' ).change(); // Reset WooSelect selected value.
+			exportCategory.val( '' ).trigger( 'change' ); // Reset WooSelect selected value.
 		} else {
 			exportCategory.closest( 'tr' ).show();
 		}
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index fffe5168a0f..d4b6d80ece0 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -72,13 +72,13 @@ jQuery( function( $ ) {
 			} );
 
 			$( '.store-state-container' ).show();
-			$state_select.selectWoo().val( wc_base_state ).change().prop( 'required', true );
+			$state_select.selectWoo().val( wc_base_state ).trigger( 'change' ).prop( 'required', true );
 		} else {
 			$( '.store-state-container' ).hide();
-			$state_select.empty().val( '' ).change().prop( 'required', false );
+			$state_select.empty().val( '' ).trigger( 'change' ).prop( 'required', false );
 		}
 
-		$( '#currency_code' ).val( wc_setup_currencies[ country ] ).change();
+		$( '#currency_code' ).val( wc_setup_currencies[ country ] ).trigger( 'change' );
 	} );
 
 	/* Setup postcode field and validations */
@@ -100,7 +100,7 @@ jQuery( function( $ ) {
 		}
 	} );
 
-	$( '#store_country' ).change();
+	$( '#store_country' ).trigger( 'change' );
 
 	$( '.wc-wizard-services' ).on( 'change', '.wc-wizard-service-enable input', function() {
 		if ( $( this ).is( ':checked' ) ) {
@@ -135,7 +135,7 @@ jQuery( function( $ ) {
 
 		var $checkbox = $( this ).find( 'input[type="checkbox"]' );
 
-		$checkbox.prop( 'checked', ! $checkbox.prop( 'checked' ) ).change();
+		$checkbox.prop( 'checked', ! $checkbox.prop( 'checked' ) ).trigger( 'change' );
 	} );
 
 	$( '.wc-wizard-services-list-toggle' ).on( 'click', function() {
@@ -165,7 +165,7 @@ jQuery( function( $ ) {
 			.removeClass( 'hide' )
 			.find( '.shipping-method-required-field' )
 			.prop( 'required', $checkbox.prop( 'checked' ) );
-	} ).find( '.wc-wizard-shipping-method-select .method' ).change();
+	} ).find( '.wc-wizard-shipping-method-select .method' ).trigger( 'change' );
 
 	$( '.wc-wizard-services' ).on( 'change', '.wc-wizard-shipping-method-enable', function() {
 		var checked = $( this ).is( ':checked' );
@@ -239,7 +239,7 @@ jQuery( function( $ ) {
 				.prop( 'disabled', true )
 				.prop( 'required', false );
 		}
-	} ).find( 'input#stripe_create_account, input#ppec_paypal_reroute_requests' ).change();
+	} ).find( 'input#stripe_create_account, input#ppec_paypal_reroute_requests' ).trigger( 'change' );
 
 	function addPlugins( bySlug, $el, hover ) {
 		var plugins = $el.data( 'plugins' );
diff --git a/assets/js/admin/wc-shipping-zone-methods.js b/assets/js/admin/wc-shipping-zone-methods.js
index 17289866132..08e4d097d0c 100644
--- a/assets/js/admin/wc-shipping-zone-methods.js
+++ b/assets/js/admin/wc-shipping-zone-methods.js
@@ -354,7 +354,7 @@
 						}
 					});
 
-					$( '.wc-shipping-zone-method-selector select' ).change();
+					$( '.wc-shipping-zone-method-selector select' ).trigger( 'change' );
 				},
 				onAddShippingMethodSubmitted: function( event, target, posted_data ) {
 					if ( 'wc-modal-add-shipping-method' === target ) {
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index 67df55711a9..0566b685c69 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -315,7 +315,7 @@
 			} else {
 				$( this ).closest( 'tr' ).next( 'tr' ).show();
 			}
-		}).change();
+		}).trigger( 'change' );
 
 		// Hidden options
 		$( '.hide_options_if_checked' ).each( function() {
@@ -331,7 +331,7 @@
 						.nextUntil( '.hide_options_if_checked, .show_options_if_checked', '.hidden_option' )
 						.show();
 				}
-			}).change();
+			}).trigger( 'change' );
 		});
 
 		$( '.show_options_if_checked' ).each( function() {
@@ -347,7 +347,7 @@
 						.nextUntil( '.hide_options_if_checked, .show_options_if_checked', '.hidden_option' )
 						.hide();
 				}
-			}).change();
+			}).trigger( 'change' );
 		});
 
 		// Reviews.
@@ -357,7 +357,7 @@
 			} else {
 				$( '#woocommerce_enable_review_rating' ).closest( 'tr' ).hide();
 			}
-		}).change();
+		}).trigger( 'change' );
 
 		// Attribute term table
 		$( 'table.attributes-table tbody tr:nth-child(odd)' ).addClass( 'alternate' );
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index dacd3185a85..f5912bff89a 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -53,7 +53,7 @@
 	 */
 	VariationForm.prototype.onReset = function( event ) {
 		event.preventDefault();
-		event.data.variationForm.$attributeFields.val( '' ).change();
+		event.data.variationForm.$attributeFields.val( '' ).trigger( 'change' );
 		event.data.variationForm.$form.trigger( 'reset_data' );
 	};
 
@@ -286,11 +286,11 @@
 		$template_html = $template_html.replace( '/*]]>*/', '' );
 
 		form.$singleVariation.html( $template_html );
-		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( variation.variation_id ).change();
+		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( variation.variation_id ).trigger( 'change' );
 
 		// Hide or show qty input
 		if ( variation.is_sold_individually === 'yes' ) {
-			$qty.find( 'input.qty' ).val( '1' ).attr( 'min', '1' ).attr( 'max', '' ).change();
+			$qty.find( 'input.qty' ).val( '1' ).attr( 'min', '1' ).attr( 'max', '' ).trigger( 'change' );
 			$qty.hide();
 		} else {
 
@@ -304,7 +304,7 @@
 				qty_val = qty_val < parseFloat( variation.min_qty ) ? variation.min_qty : qty_val;
 			}
 
-			$qty_input.attr( 'min', variation.min_qty ).attr( 'max', variation.max_qty ).val( qty_val ).change();
+			$qty_input.attr( 'min', variation.min_qty ).attr( 'max', variation.max_qty ).val( qty_val ).trigger( 'change' );
 			$qty.show();
 		}
 
@@ -327,7 +327,7 @@
 	VariationForm.prototype.onChange = function( event ) {
 		var form = event.data.variationForm;
 
-		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).change();
+		form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).trigger( 'change' );
 		form.$form.find( '.wc-no-matching-variations' ).remove();
 
 		if ( form.useAjax ) {
@@ -484,7 +484,7 @@
 				if ( selected_attr_val_valid ) {
 					current_attr_select.val( selected_attr_val );
 				} else {
-					current_attr_select.val( '' ).change();
+					current_attr_select.val( '' ).trigger( 'change' );
 				}
 			} else {
 				current_attr_select.val( '' ); // No change event to prevent infinite loop.
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 90e05c913fc..6ffb3c08044 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -50,7 +50,7 @@ jQuery( function( $ ) {
 			this.$checkout_form.on( 'change', '#ship-to-different-address input', this.ship_to_different_address );
 
 			// Trigger events
-			this.$checkout_form.find( '#ship-to-different-address input' ).change();
+			this.$checkout_form.find( '#ship-to-different-address input' ).trigger( 'change' );
 			this.init_payment_methods();
 
 			// Update on page load
@@ -58,7 +58,7 @@ jQuery( function( $ ) {
 				$( document.body ).trigger( 'init_checkout' );
 			}
 			if ( wc_checkout_params.option_guest_checkout === 'yes' ) {
-				$( 'input#createaccount' ).change( this.toggle_create_account ).change();
+				$( 'input#createaccount' ).change( this.toggle_create_account ).trigger( 'change' );
 			}
 		},
 		init_payment_methods: function() {
@@ -130,7 +130,7 @@ jQuery( function( $ ) {
 
 			if ( $( this ).is( ':checked' ) ) {
 				// Ensure password is not pre-populated.
-				$( '#account_password' ).val( '' ).change();
+				$( '#account_password' ).val( '' ).trigger( 'change' );
 				$( 'div.create-account' ).slideDown();
 			}
 		},
@@ -380,11 +380,11 @@ jQuery( function( $ ) {
 							var ID = $( this ).attr( 'id' );
 							if ( ID ) {
 								if ( $.inArray( $( this ).attr( 'type' ), [ 'checkbox', 'radio' ] ) !== -1 ) {
-									$( this ).prop( 'checked', paymentDetails[ ID ] ).change();
+									$( this ).prop( 'checked', paymentDetails[ ID ] ).trigger( 'change' );
 								} else if ( $.inArray( $( this ).attr( 'type' ), [ 'select' ] ) !== -1 ) {
-									$( this ).val( paymentDetails[ ID ] ).change();
+									$( this ).val( paymentDetails[ ID ] ).trigger( 'change' );
 								} else if ( null !== $( this ).val() && 0 === $( this ).val().length ) {
-									$( this ).val( paymentDetails[ ID ] ).change();
+									$( this ).val( paymentDetails[ ID ] ).trigger( 'change' );
 								}
 							}
 						});
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 20ab4a64c66..2ef172bbc67 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -142,7 +142,7 @@ jQuery( function( $ ) {
 					$statebox.append( $option );
 				} );
 
-				$statebox.val( value ).change();
+				$statebox.val( value ).trigger( 'change' );
 
 				$( document.body ).trigger( 'country_to_state_changed', [country, $wrapper ] );
 			}
diff --git a/assets/js/frontend/password-strength-meter.js b/assets/js/frontend/password-strength-meter.js
index a1c33755c64..835a1a74c67 100644
--- a/assets/js/frontend/password-strength-meter.js
+++ b/assets/js/frontend/password-strength-meter.js
@@ -17,7 +17,7 @@
 					'form.edit-account #password_1, form.lost_reset_password #password_1',
 					this.strengthMeter
 				);
-			$( 'form.checkout #createaccount' ).change();
+			$( 'form.checkout #createaccount' ).trigger( 'change' );
 		},
 
 		/**

From c905d21862cfbbd9d593a86e71c278877f26955c Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:12:16 -0700
Subject: [PATCH 08/15] Replace jQuery.blur() except in 3rd party assets

---
 assets/js/frontend/checkout.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 6ffb3c08044..a702dbfaf75 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -406,7 +406,7 @@ jQuery( function( $ ) {
 						}
 
 						// Lose focus for all fields
-						$form.find( '.input-text, select, input:checkbox' ).trigger( 'validate' ).blur();
+						$form.find( '.input-text, select, input:checkbox' ).trigger( 'validate' ).trigger( 'blur' );
 
 						wc_checkout_form.scroll_to_notices();
 					}
@@ -560,7 +560,7 @@ jQuery( function( $ ) {
 			$( '.woocommerce-NoticeGroup-checkout, .woocommerce-error, .woocommerce-message' ).remove();
 			wc_checkout_form.$checkout_form.prepend( '<div class="woocommerce-NoticeGroup woocommerce-NoticeGroup-checkout">' + error_message + '</div>' ); // eslint-disable-line max-len
 			wc_checkout_form.$checkout_form.removeClass( 'processing' ).unblock();
-			wc_checkout_form.$checkout_form.find( '.input-text, select, input:checkbox' ).trigger( 'validate' ).blur();
+			wc_checkout_form.$checkout_form.find( '.input-text, select, input:checkbox' ).trigger( 'validate' ).trigger( 'blur' );
 			wc_checkout_form.scroll_to_notices();
 			$( document.body ).trigger( 'checkout_error' , [ error_message ] );
 		},

From 489d8042d0d09cbed1f1a5caa911010d995355d8 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:15:15 -0700
Subject: [PATCH 09/15] Replace jQuery.trim() except in 3rd party assets

---
 assets/js/admin/api-keys.js                 | 2 +-
 assets/js/admin/system-status.js            | 6 +++---
 assets/js/frontend/add-to-cart-variation.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 6ac852ff214..5c22ef3640e 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -58,7 +58,7 @@
 					} else {
 						$( '#copy-error' ).text( '' );
 						wcClearClipboard();
-						wcSetClipboard( $.trim( $( this ).prev( 'input' ).val() ), $( css_class ) );
+						wcSetClipboard( $( this ).prev( 'input' ).val().trim(), $( css_class ) );
 					}
 				} )
 				.on( 'aftercopy', css_class, function() {
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index 317625898c1..6cdb54d14cf 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -34,11 +34,11 @@ jQuery( function ( $ ) {
 			$( '.wc_status_table thead, .wc_status_table tbody' ).each( function() {
 				if ( $( this ).is( 'thead' ) ) {
 					var label = $( this ).find( 'th:eq(0)' ).data( 'export-label' ) || $( this ).text();
-					report = report + '\n### ' + $.trim( label ) + ' ###\n\n';
+					report = report + '\n### ' + label.trim() + ' ###\n\n';
 				} else {
 					$( 'tr', $( this ) ).each( function() {
 						var label       = $( this ).find( 'td:eq(0)' ).data( 'export-label' ) || $( this ).find( 'td:eq(0)' ).text();
-						var the_name    = $.trim( label ).replace( /(<([^>]+)>)/ig, '' ); // Remove HTML.
+						var the_name    = label.trim().replace( /(<([^>]+)>)/ig, '' ); // Remove HTML.
 
 						// Find value
 						var $value_html = $( this ).find( 'td:eq(2)' ).clone();
@@ -47,7 +47,7 @@ jQuery( function ( $ ) {
 						$value_html.find( '.dashicons-no-alt, .dashicons-warning' ).replaceWith( '&#10060;' );
 
 						// Format value
-						var the_value   = $.trim( $value_html.text() );
+						var the_value   = $value_html.text().trim();
 						var value_array = the_value.split( ', ' );
 
 						if ( value_array.length > 1 ) {
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index f5912bff89a..71f46d7fd4c 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -314,7 +314,7 @@
 		}
 
 		// Reveal
-		if ( $.trim( form.$singleVariation.text() ) ) {
+		if ( form.$singleVariation.text().trim() ) {
 			form.$singleVariation.slideDown( 200 ).trigger( 'show_variation', [ variation, purchasable ] );
 		} else {
 			form.$singleVariation.show().trigger( 'show_variation', [ variation, purchasable ] );

From e6f620d1565e55a1c10039885582bb65ca0c7219 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 7 Jan 2021 15:16:59 -0700
Subject: [PATCH 10/15] Revert "replace jQuery..bind except in 3rd party
 assets"

This reverts commit 61c4e20863ec1dfce21b1c8d0596314a36708371.
---
 .../js/admin/meta-boxes-product-variation.js  |  2 +-
 assets/js/admin/meta-boxes-product.js         |  2 +-
 assets/js/admin/reports.js                    |  2 +-
 assets/js/admin/wc-product-export.js          |  2 +-
 assets/js/admin/wc-product-import.js          |  2 +-
 assets/js/admin/wc-setup.js                   |  2 +-
 assets/js/admin/woocommerce_admin.js          |  2 +-
 assets/js/frontend/add-to-cart-variation.js   |  8 +++---
 assets/js/frontend/add-to-cart.js             |  4 +--
 assets/js/frontend/address-i18n.js            |  2 +-
 assets/js/frontend/cart-fragments.js          |  2 +-
 assets/js/frontend/cart.js                    | 26 +++++++++----------
 assets/js/frontend/checkout.js                |  4 +--
 assets/js/frontend/country-select.js          |  2 +-
 assets/js/frontend/single-product.js          | 14 +++++-----
 assets/js/frontend/tokenization-form.js       | 10 +++----
 16 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index a157be435c6..ad5aca88b19 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -346,7 +346,7 @@ jQuery( function( $ ) {
 
 			postForm.on( 'submit', this.save_on_submit );
 
-			$( 'input:submit', postForm ).on( 'click keypress', function() {
+			$( 'input:submit', postForm ).bind( 'click keypress', function() {
 				postForm.data( 'callerid', this.id );
 			});
 
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index 403db648a43..0cd2aa830d0 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -20,7 +20,7 @@ jQuery( function( $ ) {
 	});
 
 	// Prevent enter submitting post form.
-	$( '#upsell_product_data' ).on( 'keypress', function( e ) {
+	$( '#upsell_product_data' ).bind( 'keypress', function( e ) {
 		if ( e.keyCode === 13 ) {
 			return false;
 		}
diff --git a/assets/js/admin/reports.js b/assets/js/admin/reports.js
index 8f3857aef01..34ec4ff2be6 100644
--- a/assets/js/admin/reports.js
+++ b/assets/js/admin/reports.js
@@ -10,7 +10,7 @@ jQuery(function( $ ) {
 	var prev_data_index = null;
 	var prev_series_index = null;
 
-	$( '.chart-placeholder' ).on( 'plothover', function ( event, pos, item ) {
+	$( '.chart-placeholder' ).bind( 'plothover', function ( event, pos, item ) {
 		if ( item ) {
 			if ( prev_data_index !== item.dataIndex || prev_series_index !== item.seriesIndex ) {
 				prev_data_index   = item.dataIndex;
diff --git a/assets/js/admin/wc-product-export.js b/assets/js/admin/wc-product-export.js
index 84a065214b2..d49928ddb9e 100644
--- a/assets/js/admin/wc-product-export.js
+++ b/assets/js/admin/wc-product-export.js
@@ -11,7 +11,7 @@
 		this.$form.find('.woocommerce-exporter-progress').val( 0 );
 
 		// Methods.
-		this.processStep = this.processStep.on( this );
+		this.processStep = this.processStep.bind( this );
 
 		// Events.
 		$form.on( 'submit', { productExportForm: this }, this.onSubmit );
diff --git a/assets/js/admin/wc-product-import.js b/assets/js/admin/wc-product-import.js
index 5222ac4c13f..645f11b5912 100644
--- a/assets/js/admin/wc-product-import.js
+++ b/assets/js/admin/wc-product-import.js
@@ -23,7 +23,7 @@
 		// Initial state.
 		this.$form.find('.woocommerce-importer-progress').val( 0 );
 
-		this.run_import = this.run_import.on( this );
+		this.run_import = this.run_import.bind( this );
 
 		// Start importing.
 		this.run_import();
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index d4b6d80ece0..315ef4218a1 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -252,7 +252,7 @@ jQuery( function( $ ) {
 			bySlug[ slug ].find( 'a' )
 				.on( 'mouseenter mouseleave', ( function( $hover, event ) {
 					$hover.toggleClass( 'plugin-install-source', 'mouseenter' === event.type );
-				} ).on( null, hover ? $el.closest( hover ) : $el ) );
+				} ).bind( null, hover ? $el.closest( hover ) : $el ) );
 		}
 	}
 
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index 0566b685c69..e5b52ab412e 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -250,7 +250,7 @@
 		var shifted    = false;
 		var hasFocus   = false;
 
-		$( document.body ).on( 'keyup keydown', function( e ) {
+		$( document.body ).bind( 'keyup keydown', function( e ) {
 			shifted    = e.shiftKey;
 			controlled = e.ctrlKey || e.metaKey;
 		});
diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index 71f46d7fd4c..1835bf5e714 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -22,10 +22,10 @@
 		self.$form.off( '.wc-variation-form' );
 
 		// Methods.
-		self.getChosenAttributes    = self.getChosenAttributes.on( self );
-		self.findMatchingVariations = self.findMatchingVariations.on( self );
-		self.isMatch                = self.isMatch.on( self );
-		self.toggleResetLink        = self.toggleResetLink.on( self );
+		self.getChosenAttributes    = self.getChosenAttributes.bind( self );
+		self.findMatchingVariations = self.findMatchingVariations.bind( self );
+		self.isMatch                = self.isMatch.bind( self );
+		self.toggleResetLink        = self.toggleResetLink.bind( self );
 
 		// Events.
 		$form.on( 'click.wc-variation-form', '.reset_variations', { variationForm: self }, self.onReset );
diff --git a/assets/js/frontend/add-to-cart.js b/assets/js/frontend/add-to-cart.js
index d97cb7746e4..e27baf072a4 100644
--- a/assets/js/frontend/add-to-cart.js
+++ b/assets/js/frontend/add-to-cart.js
@@ -10,8 +10,8 @@ jQuery( function( $ ) {
 	 */
 	var AddToCartHandler = function() {
 		this.requests   = [];
-		this.addRequest = this.addRequest.on( this );
-		this.run        = this.run.on( this );
+		this.addRequest = this.addRequest.bind( this );
+		this.run        = this.run.bind( this );
 
 		$( document.body )
 			.on( 'click', '.add_to_cart_button', { addToCartHandler: this }, this.onAddToCart )
diff --git a/assets/js/frontend/address-i18n.js b/assets/js/frontend/address-i18n.js
index f71dd266e3b..b66c0adae30 100644
--- a/assets/js/frontend/address-i18n.js
+++ b/assets/js/frontend/address-i18n.js
@@ -32,7 +32,7 @@ jQuery( function( $ ) {
 
 	// Handle locale
 	$( document.body )
-		.on( 'country_to_state_changing', function( event, country, wrapper ) {
+		.bind( 'country_to_state_changing', function( event, country, wrapper ) {
 			var thisform = wrapper, thislocale;
 
 			if ( typeof locale[ country ] !== 'undefined' ) {
diff --git a/assets/js/frontend/cart-fragments.js b/assets/js/frontend/cart-fragments.js
index e70ad4ad36c..c5eef7b4c72 100644
--- a/assets/js/frontend/cart-fragments.js
+++ b/assets/js/frontend/cart-fragments.js
@@ -180,7 +180,7 @@ jQuery( function( $ ) {
 		wp.customize.widgetsPreview.WidgetPartial
 	);
 	if ( hasSelectiveRefresh ) {
-		wp.customize.selectiveRefresh.on( 'partial-content-rendered', function() {
+		wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
 			refresh_cart_fragment();
 		} );
 	}
diff --git a/assets/js/frontend/cart.js b/assets/js/frontend/cart.js
index d2a8b55f0b8..622c8eb1437 100644
--- a/assets/js/frontend/cart.js
+++ b/assets/js/frontend/cart.js
@@ -152,9 +152,9 @@ jQuery( function( $ ) {
 		 */
 		init: function( cart ) {
 			this.cart                       = cart;
-			this.toggle_shipping            = this.toggle_shipping.on( this );
-			this.shipping_method_selected   = this.shipping_method_selected.on( this );
-			this.shipping_calculator_submit = this.shipping_calculator_submit.on( this );
+			this.toggle_shipping            = this.toggle_shipping.bind( this );
+			this.shipping_method_selected   = this.shipping_method_selected.bind( this );
+			this.shipping_calculator_submit = this.shipping_calculator_submit.bind( this );
 
 			$( document ).on(
 				'click',
@@ -261,16 +261,16 @@ jQuery( function( $ ) {
 		 * Initialize cart UI events.
 		 */
 		init: function() {
-			this.update_cart_totals    = this.update_cart_totals.on( this );
-			this.input_keypress        = this.input_keypress.on( this );
-			this.cart_submit           = this.cart_submit.on( this );
-			this.submit_click          = this.submit_click.on( this );
-			this.apply_coupon          = this.apply_coupon.on( this );
-			this.remove_coupon_clicked = this.remove_coupon_clicked.on( this );
-			this.quantity_update       = this.quantity_update.on( this );
-			this.item_remove_clicked   = this.item_remove_clicked.on( this );
-			this.item_restore_clicked  = this.item_restore_clicked.on( this );
-			this.update_cart           = this.update_cart.on( this );
+			this.update_cart_totals    = this.update_cart_totals.bind( this );
+			this.input_keypress        = this.input_keypress.bind( this );
+			this.cart_submit           = this.cart_submit.bind( this );
+			this.submit_click          = this.submit_click.bind( this );
+			this.apply_coupon          = this.apply_coupon.bind( this );
+			this.remove_coupon_clicked = this.remove_coupon_clicked.bind( this );
+			this.quantity_update       = this.quantity_update.bind( this );
+			this.item_remove_clicked   = this.item_remove_clicked.bind( this );
+			this.item_restore_clicked  = this.item_restore_clicked.bind( this );
+			this.update_cart           = this.update_cart.bind( this );
 
 			$( document ).on(
 				'wc_update_cart added_to_cart',
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index a702dbfaf75..41f6b3742a5 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -16,8 +16,8 @@ jQuery( function( $ ) {
 		$order_review: $( '#order_review' ),
 		$checkout_form: $( 'form.checkout' ),
 		init: function() {
-			$( document.body ).on( 'update_checkout', this.update_checkout );
-			$( document.body ).on( 'init_checkout', this.init_checkout );
+			$( document.body ).bind( 'update_checkout', this.update_checkout );
+			$( document.body ).bind( 'init_checkout', this.init_checkout );
 
 			// Payment methods
 			this.$checkout_form.on( 'click', 'input[name="payment_method"]', this.payment_method_selected );
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 2ef172bbc67..68a525bbeab 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -70,7 +70,7 @@ jQuery( function( $ ) {
 
 		wc_country_select_select2();
 
-		$( document.body ).on( 'country_to_state_changed', function() {
+		$( document.body ).bind( 'country_to_state_changed', function() {
 			wc_country_select_select2();
 		});
 	}
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index 852f68c84fe..fee12d826d8 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -118,13 +118,13 @@ jQuery( function( $ ) {
 		}
 
 		// Bind functions to this.
-		this.initFlexslider       = this.initFlexslider.on( this );
-		this.initZoom             = this.initZoom.on( this );
-		this.initZoomForTarget    = this.initZoomForTarget.on( this );
-		this.initPhotoswipe       = this.initPhotoswipe.on( this );
-		this.onResetSlidePosition = this.onResetSlidePosition.on( this );
-		this.getGalleryItems      = this.getGalleryItems.on( this );
-		this.openPhotoswipe       = this.openPhotoswipe.on( this );
+		this.initFlexslider       = this.initFlexslider.bind( this );
+		this.initZoom             = this.initZoom.bind( this );
+		this.initZoomForTarget    = this.initZoomForTarget.bind( this );
+		this.initPhotoswipe       = this.initPhotoswipe.bind( this );
+		this.onResetSlidePosition = this.onResetSlidePosition.bind( this );
+		this.getGalleryItems      = this.getGalleryItems.bind( this );
+		this.openPhotoswipe       = this.openPhotoswipe.bind( this );
 
 		if ( this.flexslider_enabled ) {
 			this.initFlexslider( args.flexslider );
diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js
index 9fde864d1c1..3a5a8bffbad 100644
--- a/assets/js/frontend/tokenization-form.js
+++ b/assets/js/frontend/tokenization-form.js
@@ -15,11 +15,11 @@ jQuery( function( $ ) {
 		}, wc_tokenization_form_params );
 
 		// Bind functions to this.
-		this.onDisplay             = this.onDisplay.on( this );
-		this.hideForm              = this.hideForm.on( this );
-		this.showForm              = this.showForm.on( this );
-		this.showSaveNewCheckbox   = this.showSaveNewCheckbox.on( this );
-		this.hideSaveNewCheckbox   = this.hideSaveNewCheckbox.on( this );
+		this.onDisplay             = this.onDisplay.bind( this );
+		this.hideForm              = this.hideForm.bind( this );
+		this.showForm              = this.showForm.bind( this );
+		this.showSaveNewCheckbox   = this.showSaveNewCheckbox.bind( this );
+		this.hideSaveNewCheckbox   = this.hideSaveNewCheckbox.bind( this );
 
 		// When a radio button is changed, make sure to show/hide our new CC info area.
 		this.$target.on(

From 34bd50bce39b9f20ef2032ff462908fa016da4ff Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Thu, 21 Jan 2021 10:22:30 -0700
Subject: [PATCH 11/15] replace removeAttr with prop()

---
 assets/js/frontend/add-to-cart-variation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/frontend/add-to-cart-variation.js b/assets/js/frontend/add-to-cart-variation.js
index 1835bf5e714..eb833d13b6c 100644
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@@ -379,7 +379,7 @@
 			if ( ! current_attr_select.data( 'attribute_html' ) ) {
 				var refSelect = current_attr_select.clone();
 
-				refSelect.find( 'option' ).removeAttr( 'disabled attached' ).removeAttr( 'selected' );
+				refSelect.find( 'option' ).prop( 'disabled attached', false ).prop( 'selected', false );
 
 				// Legacy data attribute.
 				current_attr_select.data(

From b2eb2d8724ee4bb3814f76d2db3567b42a03f54d Mon Sep 17 00:00:00 2001
From: roykho <roykho77@gmail.com>
Date: Thu, 28 Jan 2021 14:42:40 -0800
Subject: [PATCH 12/15] Update tax rate label when saving order closes #28649

---
 includes/abstracts/abstract-wc-order.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index d29bab3e8cc..9cb4a94f717 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -1634,6 +1634,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 			}
 			$saved_rate_ids[] = $tax->get_rate_id();
 			$tax->set_tax_total( isset( $cart_taxes[ $tax->get_rate_id() ] ) ? $cart_taxes[ $tax->get_rate_id() ] : 0 );
+			$tax->set_label( WC_Tax::get_rate_label( $tax->get_rate_id() ) );
 			$tax->set_shipping_tax_total( ! empty( $shipping_taxes[ $tax->get_rate_id() ] ) ? $shipping_taxes[ $tax->get_rate_id() ] : 0 );
 			$tax->save();
 		}

From 9b7b72f00af2d7957aadaf6ff68141a14391fc41 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Tue, 2 Feb 2021 09:38:04 -0700
Subject: [PATCH 13/15] replace jQuery.bind except in 3rd party assets

---
 assets/js/admin/meta-boxes-product-variation.js | 2 +-
 assets/js/admin/meta-boxes-product.js           | 2 +-
 assets/js/admin/reports.js                      | 2 +-
 assets/js/admin/woocommerce_admin.js            | 2 +-
 assets/js/frontend/address-i18n.js              | 2 +-
 assets/js/frontend/cart-fragments.js            | 2 +-
 assets/js/frontend/checkout.js                  | 4 ++--
 assets/js/frontend/country-select.js            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/js/admin/meta-boxes-product-variation.js b/assets/js/admin/meta-boxes-product-variation.js
index ad5aca88b19..a157be435c6 100644
--- a/assets/js/admin/meta-boxes-product-variation.js
+++ b/assets/js/admin/meta-boxes-product-variation.js
@@ -346,7 +346,7 @@ jQuery( function( $ ) {
 
 			postForm.on( 'submit', this.save_on_submit );
 
-			$( 'input:submit', postForm ).bind( 'click keypress', function() {
+			$( 'input:submit', postForm ).on( 'click keypress', function() {
 				postForm.data( 'callerid', this.id );
 			});
 
diff --git a/assets/js/admin/meta-boxes-product.js b/assets/js/admin/meta-boxes-product.js
index 0cd2aa830d0..403db648a43 100644
--- a/assets/js/admin/meta-boxes-product.js
+++ b/assets/js/admin/meta-boxes-product.js
@@ -20,7 +20,7 @@ jQuery( function( $ ) {
 	});
 
 	// Prevent enter submitting post form.
-	$( '#upsell_product_data' ).bind( 'keypress', function( e ) {
+	$( '#upsell_product_data' ).on( 'keypress', function( e ) {
 		if ( e.keyCode === 13 ) {
 			return false;
 		}
diff --git a/assets/js/admin/reports.js b/assets/js/admin/reports.js
index 34ec4ff2be6..8f3857aef01 100644
--- a/assets/js/admin/reports.js
+++ b/assets/js/admin/reports.js
@@ -10,7 +10,7 @@ jQuery(function( $ ) {
 	var prev_data_index = null;
 	var prev_series_index = null;
 
-	$( '.chart-placeholder' ).bind( 'plothover', function ( event, pos, item ) {
+	$( '.chart-placeholder' ).on( 'plothover', function ( event, pos, item ) {
 		if ( item ) {
 			if ( prev_data_index !== item.dataIndex || prev_series_index !== item.seriesIndex ) {
 				prev_data_index   = item.dataIndex;
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index e5b52ab412e..0566b685c69 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -250,7 +250,7 @@
 		var shifted    = false;
 		var hasFocus   = false;
 
-		$( document.body ).bind( 'keyup keydown', function( e ) {
+		$( document.body ).on( 'keyup keydown', function( e ) {
 			shifted    = e.shiftKey;
 			controlled = e.ctrlKey || e.metaKey;
 		});
diff --git a/assets/js/frontend/address-i18n.js b/assets/js/frontend/address-i18n.js
index b66c0adae30..f71dd266e3b 100644
--- a/assets/js/frontend/address-i18n.js
+++ b/assets/js/frontend/address-i18n.js
@@ -32,7 +32,7 @@ jQuery( function( $ ) {
 
 	// Handle locale
 	$( document.body )
-		.bind( 'country_to_state_changing', function( event, country, wrapper ) {
+		.on( 'country_to_state_changing', function( event, country, wrapper ) {
 			var thisform = wrapper, thislocale;
 
 			if ( typeof locale[ country ] !== 'undefined' ) {
diff --git a/assets/js/frontend/cart-fragments.js b/assets/js/frontend/cart-fragments.js
index c5eef7b4c72..e70ad4ad36c 100644
--- a/assets/js/frontend/cart-fragments.js
+++ b/assets/js/frontend/cart-fragments.js
@@ -180,7 +180,7 @@ jQuery( function( $ ) {
 		wp.customize.widgetsPreview.WidgetPartial
 	);
 	if ( hasSelectiveRefresh ) {
-		wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
+		wp.customize.selectiveRefresh.on( 'partial-content-rendered', function() {
 			refresh_cart_fragment();
 		} );
 	}
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 41f6b3742a5..a702dbfaf75 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -16,8 +16,8 @@ jQuery( function( $ ) {
 		$order_review: $( '#order_review' ),
 		$checkout_form: $( 'form.checkout' ),
 		init: function() {
-			$( document.body ).bind( 'update_checkout', this.update_checkout );
-			$( document.body ).bind( 'init_checkout', this.init_checkout );
+			$( document.body ).on( 'update_checkout', this.update_checkout );
+			$( document.body ).on( 'init_checkout', this.init_checkout );
 
 			// Payment methods
 			this.$checkout_form.on( 'click', 'input[name="payment_method"]', this.payment_method_selected );
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 68a525bbeab..2ef172bbc67 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -70,7 +70,7 @@ jQuery( function( $ ) {
 
 		wc_country_select_select2();
 
-		$( document.body ).bind( 'country_to_state_changed', function() {
+		$( document.body ).on( 'country_to_state_changed', function() {
 			wc_country_select_select2();
 		});
 	}

From afd164e271240ec4696d2b96ebc4c24cfeabf645 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Tue, 2 Feb 2021 13:38:48 -0700
Subject: [PATCH 14/15] revert 0ccff4dda56397af993b4932990dc72e9b28171c.
 restore jQuery .focus()

---
 assets/js/admin/api-keys.js          | 6 +++---
 assets/js/admin/backbone-modal.js    | 2 +-
 assets/js/admin/meta-boxes-coupon.js | 2 +-
 assets/js/admin/meta-boxes-order.js  | 4 ++--
 assets/js/admin/settings.js          | 4 ++--
 assets/js/admin/system-status.js     | 6 +++---
 assets/js/admin/woocommerce_admin.js | 2 +-
 assets/js/frontend/checkout.js       | 2 +-
 assets/js/frontend/country-select.js | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 5c22ef3640e..469959b75f7 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -53,7 +53,7 @@
 				.on( 'click', css_class, function( evt ) {
 					evt.preventDefault();
 					if ( ! document.queryCommandSupported( 'copy' ) ) {
-						$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
+						$( css_class ).parent().find( 'input' ).focus().trigger( 'select' );
 						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 					} else {
 						$( '#copy-error' ).text( '' );
@@ -69,10 +69,10 @@
 						'fadeIn':     50,
 						'fadeOut':    50,
 						'delay':      0
-					} ).trigger( 'focus' );
+					} ).focus();
 				} )
 				.on( 'aftercopyerror', css_class, function() {
-					$( css_class ).parent().find( 'input' ).trigger( 'focus' ).trigger( 'select' );
+					$( css_class ).parent().find( 'input' ).focus().trigger( 'select' );
 					$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 				} );
 		},
diff --git a/assets/js/admin/backbone-modal.js b/assets/js/admin/backbone-modal.js
index c1d92c4dab9..63cca56422a 100644
--- a/assets/js/admin/backbone-modal.js
+++ b/assets/js/admin/backbone-modal.js
@@ -88,7 +88,7 @@
 			}).append( this.$el );
 
 			this.resizeContent();
-			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).trigger( 'focus' );
+			this.$( '.wc-backbone-modal-content' ).attr( 'tabindex' , '0' ).focus();
 
 			$( document.body ).trigger( 'init_tooltips' );
 
diff --git a/assets/js/admin/meta-boxes-coupon.js b/assets/js/admin/meta-boxes-coupon.js
index 594726739c0..c4327f33644 100644
--- a/assets/js/admin/meta-boxes-coupon.js
+++ b/assets/js/admin/meta-boxes-coupon.js
@@ -61,7 +61,7 @@ jQuery(function( $ ) {
 				);
 			}
 			$result = woocommerce_admin_meta_boxes_coupon.prefix + $result + woocommerce_admin_meta_boxes_coupon.suffix;
-			$coupon_code_field.trigger( 'focus' ).val( $result );
+			$coupon_code_field.focus().val( $result );
 			$coupon_code_label.addClass( 'screen-reader-text' );
 		}
 	};
diff --git a/assets/js/admin/meta-boxes-order.js b/assets/js/admin/meta-boxes-order.js
index bc7c09a0115..2267afe26ed 100644
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@@ -1470,7 +1470,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).trigger( 'focus' );
+			}).focus();
 		},
 
 		/**
@@ -1483,7 +1483,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).trigger( 'focus' );
+			}).focus();
 		}
 	};
 
diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index d0deee11e27..de5931fd25d 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -126,7 +126,7 @@
 			var moveBtn = $( this ),
 				$row    = moveBtn.closest( 'tr' );
 
-			moveBtn.trigger( 'focus' );
+			moveBtn.focus();
 
 			var isMoveUp = moveBtn.is( '.wc-move-up' ),
 				isMoveDown = moveBtn.is( '.wc-move-down' );
@@ -147,7 +147,7 @@
 				}
 			}
 
-			moveBtn.trigger( 'focus' ); // Re-focus after the container was moved.
+			moveBtn.focus(); // Re-focus after the container was moved.
 			moveBtn.closest( 'table' ).trigger( 'updateMoveButtons' );
 		} );
 
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index 6cdb54d14cf..dea7607a277 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -68,7 +68,7 @@ jQuery( function ( $ ) {
 
 			try {
 				$( '#debug-report' ).slideDown();
-				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).trigger( 'focus' ).trigger( 'select' );
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().trigger( 'select' );
 				$( this ).fadeOut();
 				return false;
 			} catch ( e ) {
@@ -100,7 +100,7 @@ jQuery( function ( $ ) {
 				'fadeIn':     50,
 				'fadeOut':    50,
 				'delay':      0
-			}).trigger( 'focus' );
+			}).focus();
 		},
 
 		/**
@@ -108,7 +108,7 @@ jQuery( function ( $ ) {
 		 */
 		copyFail: function() {
 			$( '.copy-error' ).removeClass( 'hidden' );
-			$( '#debug-report' ).find( 'textarea' ).trigger( 'focus' ).trigger( 'select' );
+			$( '#debug-report' ).find( 'textarea' ).focus().trigger( 'select' );
 		}
 	};
 
diff --git a/assets/js/admin/woocommerce_admin.js b/assets/js/admin/woocommerce_admin.js
index 0566b685c69..3c7903b78d2 100644
--- a/assets/js/admin/woocommerce_admin.js
+++ b/assets/js/admin/woocommerce_admin.js
@@ -232,7 +232,7 @@
 		});
 		// Focus on inputs within the table if clicked instead of trying to sort.
 		$( '.wc_input_table.sortable tbody input' ).on( 'click', function() {
-			$( this ).trigger( 'focus' );
+			$( this ).focus();
 		} );
 
 		$( '.wc_input_table .remove_rows' ).on( 'click', function() {
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index a702dbfaf75..9f272ffac69 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -582,7 +582,7 @@ jQuery( function( $ ) {
 		},
 		show_coupon_form: function() {
 			$( '.checkout_coupon' ).slideToggle( 400, function() {
-				$( '.checkout_coupon' ).find( ':input:eq(0)' ).trigger( 'focus' );
+				$( '.checkout_coupon' ).find( ':input:eq(0)' ).focus();
 			});
 			return false;
 		},
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 2ef172bbc67..0c003dd9e41 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -62,7 +62,7 @@ jQuery( function( $ ) {
 
 				$( this )
 					.on( 'select2:select', function() {
-						$( this ).trigger( 'focus' ); // Maintain focus after select https://github.com/select2/select2/issues/4384
+						$( this ).focus(); // Maintain focus after select https://github.com/select2/select2/issues/4384
 					} )
 					.selectWoo( select2_args );
 			});

From 56281fc804f134a2ef81999f89842bd53c342939 Mon Sep 17 00:00:00 2001
From: Kathy Daring <helgatheviking@gmail.com>
Date: Tue, 2 Feb 2021 13:41:07 -0700
Subject: [PATCH 15/15] Reverse adb2c6b86... Restore jQuery.select()

---
 assets/js/admin/api-keys.js      | 4 ++--
 assets/js/admin/system-status.js | 4 ++--
 assets/js/admin/wc-clipboard.js  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/js/admin/api-keys.js b/assets/js/admin/api-keys.js
index 469959b75f7..f51a2cf7e0d 100644
--- a/assets/js/admin/api-keys.js
+++ b/assets/js/admin/api-keys.js
@@ -53,7 +53,7 @@
 				.on( 'click', css_class, function( evt ) {
 					evt.preventDefault();
 					if ( ! document.queryCommandSupported( 'copy' ) ) {
-						$( css_class ).parent().find( 'input' ).focus().trigger( 'select' );
+						$( css_class ).parent().find( 'input' ).focus().select();
 						$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 					} else {
 						$( '#copy-error' ).text( '' );
@@ -72,7 +72,7 @@
 					} ).focus();
 				} )
 				.on( 'aftercopyerror', css_class, function() {
-					$( css_class ).parent().find( 'input' ).focus().trigger( 'select' );
+					$( css_class ).parent().find( 'input' ).focus().select();
 					$( '#copy-error' ).text( woocommerce_admin_api_keys.clipboard_failed );
 				} );
 		},
diff --git a/assets/js/admin/system-status.js b/assets/js/admin/system-status.js
index dea7607a277..cb84c875444 100644
--- a/assets/js/admin/system-status.js
+++ b/assets/js/admin/system-status.js
@@ -68,7 +68,7 @@ jQuery( function ( $ ) {
 
 			try {
 				$( '#debug-report' ).slideDown();
-				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().trigger( 'select' );
+				$( '#debug-report' ).find( 'textarea' ).val( '`' + report + '`' ).focus().select();
 				$( this ).fadeOut();
 				return false;
 			} catch ( e ) {
@@ -108,7 +108,7 @@ jQuery( function ( $ ) {
 		 */
 		copyFail: function() {
 			$( '.copy-error' ).removeClass( 'hidden' );
-			$( '#debug-report' ).find( 'textarea' ).focus().trigger( 'select' );
+			$( '#debug-report' ).find( 'textarea' ).focus().select();
 		}
 	};
 
diff --git a/assets/js/admin/wc-clipboard.js b/assets/js/admin/wc-clipboard.js
index 8a2391213ae..fc009d02041 100644
--- a/assets/js/admin/wc-clipboard.js
+++ b/assets/js/admin/wc-clipboard.js
@@ -17,7 +17,7 @@ function wcSetClipboard( data, $el ) {
 	}
 	var $temp_input = jQuery( '<textarea style="opacity:0">' );
 	jQuery( 'body' ).append( $temp_input );
-	$temp_input.val( data ).trigger( 'select' );
+	$temp_input.val( data ).select();
 
 	$el.trigger( 'beforecopy' );
 	try {