Resolve remaining requests & fix conflicts.

Author: joedolson

src/wp-includes/widgets/class-wp-widget-archives.php

@@ -111,21 +111,19 @@ public function widget( $args, $instance ) {
 <script>
 (( dropdownId ) => {
 	const dropdown = document.getElementById( dropdownId );
-	function onSelectChange(e) {
-		setTimeout(function() {
+	function onSelectChange(event) {
+		setTimeout( function() {
 			const lastKey = dropdown.getAttribute( 'data-lastkey' );
-			if ( 'change' === e.type && 'escape' === lastKey ) {
-				return;
-			if ( 'change' === e.type && 'escape' === dropdown.dataset.lastkey ) {
+			if ( 'change' === event.type && 'escape' === dropdown.dataset.lastkey ) {
 				return;
 			}
 			if ( dropdown.value ) {
 				document.location.href = dropdown.value;
 			}
 		}, 250 );
 	}
-	dropdown.addEventListener( 'keyup', function(e) {
-		if ( 'Escape' === e.key ) {
+	dropdown.addEventListener( 'keyup', function(event) {
+		if ( 'Escape' === event.key ) {
 			dropdown.dataset.lastkey = 'escape';
 		} else {
 			delete dropdown.dataset.lastkey;

src/wp-includes/widgets/class-wp-widget-categories.php

@@ -96,11 +96,11 @@ public function widget( $args, $instance ) {
 			?>
 
 <script>
-(function() {
-	var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' ), lastkey;
-	function onCatChange(e) {
+(( dropdownId ) => {
+	const dropdown = document.getElementById( dropdownId ); 
+	function onCatChange(event) {
 		setTimeout(function() {
-			if ( 'change' === e.type && 'escape' === dropdown.dataset.lastkey ) {
+			if ( 'change' === event.type && 'escape' === dropdown.dataset.lastkey ) {
 				return;
 			}
 			if ( dropdown.value && parseInt( dropdown.value ) > 0 ) {
@@ -109,7 +109,7 @@ function onCatChange(e) {
 		}, 250 );
 	}
 	dropdown.addEventListener( 'keyup', function(e) {
-		if ( 'Escape' === e.key ) {
+		if ( 'Escape' === event.key ) {
 			dropdown.dataset.lastkey = 'escape';
 		} else {
 			delete dropdown.dataset.lastkey;