Merge branch 'trunk' into fix/30049

Author: swissspidy

.github/workflows/pull-request-comments.yml

@@ -195,7 +195,7 @@ jobs:
             const prBody = pr.body ?? '';
             const prTitle = pr.title ?? '';
 
-            const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-)([0-9]+)', 'g' );
+            const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-|ticket:)([0-9]+)', 'g' );
             const tracTicketMatches = prBody.match( tracTicketRegex ) || prTitle.match( tracTicketRegex );
 
             if ( ! tracTicketMatches ) {

.mailmap

@@ -9,6 +9,8 @@
 Aaron D. Campbell <[email protected]> <aaroncampbell@602fd350-edb4-49c9-b593-d223f7449a82>
 Aaron Jorbin <[email protected]> <jorbin@602fd350-edb4-49c9-b593-d223f7449a82>
 Adam Silverstein <[email protected]> <adamsilverstein@602fd350-edb4-49c9-b593-d223f7449a82>
+Adam Zieliński <[email protected]> <zieladam@602fd350-edb4-49c9-b593-d223f7449a82>
+Adam Zieliński <[email protected]>
 Alex King <[email protected]> <alexkingorg@602fd350-edb4-49c9-b593-d223f7449a82>
 Alex Shiels <[email protected]> <tellyworth@602fd350-edb4-49c9-b593-d223f7449a82>
 André <[email protected]>

package-lock.json

@@ -148,12 +148,11 @@
 		"clipboard": "2.0.11",
 		"core-js-url-browser": "3.6.4",
 		"element-closest": "^3.0.2",
-		"es-module-shims": "1.8.2",
 		"formdata-polyfill": "4.0.10",
 		"hoverintent": "2.2.1",
 		"imagesloaded": "5.0.0",
 		"jquery": "3.7.1",
-		"jquery-color": "2.2.0",
+		"jquery-color": "3.0.0",
 		"jquery-form": "4.3.0",
 		"jquery-hoverintent": "1.10.2",
 		"json2php": "^0.0.7",

package.json

@@ -262,6 +262,7 @@
 	     in the parsing, and distance the code from its standard. -->
 	<rule ref="Generic.PHP.DiscourageGoto.Found">
 		<exclude-pattern>/wp-includes/html-api/class-wp-html-processor\.php</exclude-pattern>
+		<exclude-pattern>/wp-includes/html-api/class-wp-html-doctype-info\.php</exclude-pattern>
 	</rule>
 
 	<!-- Exclude sample config from modernization to prevent breaking CI workflows based on WP-CLI scaffold.

phpcs.xml.dist

@@ -1188,6 +1188,7 @@ window.commentReply = {
 		if ( er ) {
 			$errorNotice.removeClass( 'hidden' );
 			$error.html( er );
+			wp.a11y.speak( er );
 		}
 	},
 

src/js/_enqueues/admin/edit-comments.js

@@ -188,6 +188,12 @@
 		$iconPreview.removeClass( 'hidden' );
 		$removeButton.removeClass( 'hidden' );
 
+		// Set the global CSS variable for --site-icon-url to the selected image URL.
+		document.documentElement.style.setProperty(
+			'--site-icon-url',
+			'url(' + attributes.url + ')'
+		);
+
 		// If the choose button is not in the update state, swap the classes.
 		if ( $chooseButton.attr( 'data-state' ) !== '1' ) {
 			$chooseButton.attr( {

src/js/_enqueues/admin/site-icon.js

@@ -296,14 +296,16 @@
 	 * Navigate popup menu by arrow keys.
 	 *
 	 * @since 6.3.0
+	 * @since 6.7.0 Added the event parameter.
 	 *
 	 * @memberof imageEdit
 	 *
+	 * @param {Event} event The key or click event.
 	 * @param {HTMLElement} el The current element.
 	 *
 	 * @return {boolean} Always returns false.
 	 */
-	browsePopup : function(el) {
+	browsePopup : function(event, el) {
 		var $el = $( el );
 		var $collection = $( el ).parent( '.imgedit-popup-menu' ).find( 'button' );
 		var $index = $collection.index( $el );
@@ -316,14 +318,14 @@
 		if ( $next === $last ) {
 			$next = 0;
 		}
-		var $target = false;
+		var target = false;
 		if ( event.keyCode === 40 ) {
-			$target = $collection.get( $next );
+			target = $collection.get( $next );
 		} else if ( event.keyCode === 38 ) {
-			$target = $collection.get( $prev );
+			target = $collection.get( $prev );
 		}
-		if ( $target ) {
-			$target.focus();
+		if ( target ) {
+			target.focus();
 			event.preventDefault();
 		}
 

src/js/_enqueues/lib/image-edit.js

@@ -141,6 +141,15 @@
 	 */
 	wp.updates.searchTerm = '';
 
+	/**
+	 * Minimum number of characters before an ajax search is fired.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @type {number}
+	 */
+	wp.updates.searchMinCharacters = 2;
+
 	/**
 	 * Whether filesystem credentials need to be requested from the user.
 	 *
@@ -2977,14 +2986,24 @@
 			$pluginInstallSearch.attr( 'aria-describedby', 'live-search-desc' );
 		}
 
+		// Track the previous search string length.
+		var previousSearchStringLength = 0;
+		wp.updates.shouldSearch = function( searchStringLength ) {
+			var shouldSearch = searchStringLength >= wp.updates.searchMinCharacters ||
+				previousSearchStringLength > wp.updates.searchMinCharacters;
+			previousSearchStringLength = searchStringLength;
+			return shouldSearch;
+		};
+
 		/**
 		 * Handles changes to the plugin search box on the new-plugin page,
 		 * searching the repository dynamically.
 		 *
 		 * @since 4.6.0
 		 */
 		$pluginInstallSearch.on( 'keyup input', _.debounce( function( event, eventtype ) {
-			var $searchTab = $( '.plugin-install-search' ), data, searchLocation;
+			var $searchTab = $( '.plugin-install-search' ), data, searchLocation,
+				searchStringLength = $pluginInstallSearch.val().length;
 
 			data = {
 				_ajax_nonce: wp.updates.ajaxNonce,
@@ -2995,6 +3014,14 @@
 			};
 			searchLocation = location.href.split( '?' )[ 0 ] + '?' + $.param( _.omit( data, [ '_ajax_nonce', 'pagenow' ] ) );
 
+			// Set the autocomplete attribute, turning off autocomplete 1 character before ajax search kicks in.
+			if ( wp.updates.shouldSearch( searchStringLength ) ) {
+				$pluginInstallSearch.attr( 'autocomplete', 'off' );
+			} else {
+				$pluginInstallSearch.attr( 'autocomplete', 'on' );
+				return;
+			}
+
 			// Clear on escape.
 			if ( 'keyup' === event.type && 27 === event.which ) {
 				event.target.value = '';
@@ -3054,6 +3081,7 @@
 
 		if ( $pluginSearch.length ) {
 			$pluginSearch.attr( 'aria-describedby', 'live-search-desc' );
+
 		}
 
 		/**
@@ -3069,7 +3097,16 @@
 				pagenow:       pagenow,
 				plugin_status: 'all'
 			},
-			queryArgs;
+			queryArgs,
+			searchStringLength = $pluginSearch.val().length;
+
+			// Set the autocomplete attribute, turning off autocomplete 1 character before ajax search kicks in.
+			if ( wp.updates.shouldSearch( searchStringLength ) ) {
+				$pluginSearch.attr( 'autocomplete', 'off' );
+			} else {
+				$pluginSearch.attr( 'autocomplete', 'on' );
+				return;
+			}
 
 			// Clear on escape.
 			if ( 'keyup' === event.type && 27 === event.which ) {

src/js/_enqueues/wp/updates.js

@@ -15,8 +15,8 @@ var View = wp.media.View,
  * @augments Backbone.View
  */
 SiteIconPreview = View.extend(/** @lends wp.media.view.SiteIconPreview.prototype */{
-	className: 'site-icon-preview',
-	template: wp.template( 'site-icon-preview' ),
+	className: 'site-icon-preview-crop-modal',
+	template: wp.template( 'site-icon-preview-crop' ),
 
 	ready: function() {
 		this.controller.imgSelect.setOptions({
@@ -34,8 +34,8 @@ SiteIconPreview = View.extend(/** @lends wp.media.view.SiteIconPreview.prototype
 	updatePreview: function( img, coords ) {
 		var rx = 64 / coords.width,
 			ry = 64 / coords.height,
-			preview_rx = 16 / coords.width,
-			preview_ry = 16 / coords.height;
+			preview_rx = 24 / coords.width,
+			preview_ry = 24 / coords.height;
 
 		$( '#preview-app-icon' ).css({
 			width: Math.round(rx * this.imageWidth ) + 'px',