-
-
-
-
+
+
+
+
+
+
+
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 648740df18..c479845995 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -4168,40 +4168,41 @@ final class WP_Customize_Manager {
/* Custom CSS */
$section_description = '
';
- $section_description .= __( 'Add your own CSS code here to customize the appearance and layout of your site.', 'better-code-editing' );
+ $section_description .= __( 'Add your own CSS code here to customize the appearance and layout of your site.' );
$section_description .= sprintf(
' %2$s%3$s',
- esc_url( __( 'https://codex.wordpress.org/CSS', 'default' ) ),
- __( 'Learn more about CSS', 'default' ),
+ esc_url( __( 'https://codex.wordpress.org/CSS' ) ),
+ __( 'Learn more about CSS' ),
/* translators: accessibility text */
- __( '(opens in a new window)', 'default' )
+ __( '(opens in a new window)' )
);
$section_description .= '
';
- $section_description .= '
' . __( 'When using a keyboard to navigate:', 'better-code-editing' ) . '
';
+ $section_description .= '
' . __( 'When using a keyboard to navigate:' ) . '
';
$section_description .= '
';
- $section_description .= '- ' . __( 'In the CSS edit field, Tab enters a tab character.', 'better-code-editing' ) . '
';
- $section_description .= '- ' . __( 'To move keyboard focus, press Esc then Tab for the next element, or Esc then Shift+Tab for the previous element.', 'better-code-editing' ) . '
';
+ $section_description .= '- ' . __( 'In the editing area, the Tab key enters a tab character.' ) . '
';
+ $section_description .= '- ' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '
';
+ $section_description .= '- ' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '
';
$section_description .= '
';
if ( 'false' !== wp_get_current_user()->syntax_highlighting ) {
$section_description .= '
';
$section_description .= sprintf(
/* translators: placeholder is link to user profile */
- __( 'The edit field automatically highlights code syntax. You can disable this in your %s to work in plain text mode.', 'better-code-editing' ),
+ __( 'The edit field automatically highlights code syntax. You can disable this in your %s to work in plain text mode.' ),
sprintf(
' %2$s%3$s',
- esc_url( get_edit_profile_url() . '#syntax_highlighting' ),
- __( 'user profile', 'better-code-editing' ),
+ esc_url( get_edit_profile_url() ),
+ __( 'user profile' ),
/* translators: accessibility text */
- __( '(opens in a new window)', 'default' )
+ __( '(opens in a new window)' )
)
);
$section_description .= '
';
}
$section_description .= '
';
- $section_description .= '';
+ $section_description .= '';
$section_description .= '
';
$this->add_section( 'custom_css', array(
@@ -4218,9 +4219,13 @@ final class WP_Customize_Manager {
$this->add_setting( $custom_css_setting );
$this->add_control( new WP_Customize_Code_Editor_Control( $this, 'custom_css', array(
- 'section' => 'custom_css',
- 'settings' => array( 'default' => $custom_css_setting->id ),
- 'code_type' => 'text/css',
+ 'label' => __( 'CSS code' ),
+ 'section' => 'custom_css',
+ 'settings' => array( 'default' => $custom_css_setting->id ),
+ 'code_type' => 'text/css',
+ 'input_attrs' => array(
+ 'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4',
+ ),
) ) );
}
diff --git a/wp-includes/class-wp-customize-panel.php b/wp-includes/class-wp-customize-panel.php
index 53b90bde65..731dd2080a 100644
--- a/wp-includes/class-wp-customize-panel.php
+++ b/wp-includes/class-wp-customize-panel.php
@@ -363,7 +363,7 @@ class WP_Customize_Panel {
echo sprintf( __( 'You are customizing %s' ), '
{{ data.title }}' );
?>
<# if ( data.description ) { #>
-
+
<# } #>
<# if ( data.description ) { #>
diff --git a/wp-includes/customize/class-wp-customize-code-editor-control.php b/wp-includes/customize/class-wp-customize-code-editor-control.php
index b3a3c99eeb..1b2be4d57d 100644
--- a/wp-includes/customize/class-wp-customize-code-editor-control.php
+++ b/wp-includes/customize/class-wp-customize-code-editor-control.php
@@ -71,6 +71,7 @@ class WP_Customize_Code_Editor_Control extends WP_Customize_Control {
$json = parent::json();
$json['code_type'] = $this->code_type;
$json['editor_settings'] = $this->editor_settings;
+ $json['input_attrs'] = $this->input_attrs;
return $json;
}
@@ -98,7 +99,11 @@ class WP_Customize_Code_Editor_Control extends WP_Customize_Control {
{{{ data.description }}}
<# } #>
-
+
<# var elementIdPrefix = 'el' + String( Math.random() ).replace( /\D/g, '' ) + '_' #>
-
+
-
+
@@ -230,7 +230,7 @@ class WP_Widget_Custom_HTML extends WP_Widget {
<# if ( data.codeEditorDisabled ) { #>
-
+
, ', $disallowed_html ); ?>
<# } #>
@@ -254,25 +254,28 @@ class WP_Widget_Custom_HTML extends WP_Widget {
$content .= __( 'Use the Custom HTML widget to add arbitrary HTML code to your widget areas.' );
$content .= '';
- $content .= '
' . __( 'When using a keyboard to navigate:' ) . '
';
- $content .= '
';
- $content .= '- ' . __( 'In the HTML edit field, Tab enters a tab character.' ) . '
';
- $content .= '- ' . __( 'To move keyboard focus, press Esc then Tab for the next element, or Esc then Shift+Tab for the previous element.' ) . '
';
- $content .= '
';
+ if ( 'false' !== wp_get_current_user()->syntax_highlighting ) {
+ $content .= '
';
+ $content .= sprintf(
+ /* translators: placeholder is link to user profile */
+ __( 'The edit field automatically highlights code syntax. You can disable this in your %s to work in plain text mode.' ),
+ sprintf(
+ ' %2$s%3$s',
+ esc_url( get_edit_profile_url() ),
+ __( 'user profile' ),
+ /* translators: accessibility text */
+ __( '(opens in a new window)' )
+ )
+ );
+ $content .= '
';
- $content .= '
';
- $content .= sprintf(
- /* translators: placeholder is link to user profile */
- __( 'The edit field automatically highlights code syntax. You can disable this in your %s to work in plan text mode.' ),
- sprintf(
- ' %2$s%3$s',
- esc_url( get_edit_profile_url() . '#syntax_highlighting' ),
- __( 'user profile' ),
- /* translators: accessibility text */
- __( '(opens in a new window)', 'default' )
- )
- );
- $content .= '
';
+ $content .= '
' . __( 'When using a keyboard to navigate:' ) . '
';
+ $content .= '
';
+ $content .= '- ' . __( 'In the editing area, the Tab key enters a tab character.' ) . '
';
+ $content .= '- ' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '
';
+ $content .= '- ' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '
';
+ $content .= '
';
+ }
$screen->add_help_tab( array(
'id' => 'custom_html_widget',