Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

package-lock.json

@@ -139,7 +139,7 @@
 		"formdata-polyfill": "4.0.10",
 		"hoverintent": "2.2.1",
 		"imagesloaded": "4.1.4",
-		"jquery": "3.6.1",
+		"jquery": "3.6.3",
 		"jquery-color": "2.2.0",
 		"jquery-form": "4.3.0",
 		"jquery-hoverintent": "1.10.2",

package.json

@@ -14,7 +14,7 @@
 		__ = wp.i18n.__;
 
 	/**
-	 * This object contains all function to handle the behaviour of the post boxes. The post boxes are the boxes you see
+	 * This object contains all function to handle the behavior of the post boxes. The post boxes are the boxes you see
 	 * around the content on the edit page.
 	 *
 	 * @since 2.7.0
@@ -347,7 +347,7 @@
 		},
 
 		/**
-		 * Initializes all the postboxes, mainly their sortable behaviour.
+		 * Initializes all the postboxes, mainly their sortable behavior.
 		 *
 		 * @since 2.7.0
 		 *

src/js/_enqueues/admin/postbox.js

@@ -59,7 +59,7 @@ window.addComment = ( function( window ) {
 	 * @since 5.1.1
 	 */
 	function ready() {
-		// Initialise the events.
+		// Initialize the events.
 		init();
 
 		// Set up a MutationObserver to check for comments loaded late.

src/js/_enqueues/lib/comment-reply.js

@@ -17,7 +17,7 @@
 			this._super();
 
 			// WebKit leaves focus in the TinyMCE editor unless we shift focus.
-			this.element.focus();
+			this.element._trigger('focus');
 			this._trigger('refresh');
 		}
 	});

src/js/_enqueues/lib/dialog.js

@@ -11,7 +11,7 @@
 	var __ = wp.i18n.__;
 
 	/**
-	 * Contains all the methods to initialise and control the image editor.
+	 * Contains all the methods to initialize and control the image editor.
 	 *
 	 * @namespace imageEdit
 	 */
@@ -636,7 +636,7 @@
 				btn.removeClass( 'button-activated' );
 				spin.removeClass( 'is-active' );
 			} );
-			// Initialise the Image Editor now that everything is ready.
+			// Initialize the Image Editor now that everything is ready.
 			imageEdit.init( postid );
 		} );
 

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

@@ -7,7 +7,7 @@
 	'use strict';
 
 	/**
-	 * Initialise the WP_API.
+	 * Initialize the WP_API.
 	 */
 	function WP_API() {
 		/** @namespace wp.api.models */

src/js/_enqueues/wp/api.js

@@ -1,6 +1,6 @@
 WordPress - Web publishing software
 
-Copyright 2011-2022 by the contributors
+Copyright 2011-2023 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

src/license.txt

@@ -2,6 +2,10 @@
 @import 'variables';
 @import 'mixins';
 
+/**
+ * This function name uses British English to maintain backward compatibility, as developers
+ * may use the function in their own admin CSS files. See #56811.
+ */
 @function url-friendly-colour( $color ) {
 	@return '%23' + str-slice( '#{ $color }', 2, -1 );
 }

src/wp-admin/css/colors/_admin.scss

@@ -209,7 +209,7 @@
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/article/comment-spam/">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/#keyboard-shortcuts-for-comments">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );