WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing labels to Archives and Categories dropdown widgets. 

props joedolson, jlevandowski, DrewAPicture, SergeyBiryukov.
fixes #18650.
Built from https://develop.svn.wordpress.org/trunk@31520


git-svn-id: http://core.svn.wordpress.org/trunk@31501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-23 16:32:25 +00:00
parent c6c5455d93
commit c6522e3c93
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/default-widgets.php
View File

@ -285,8 +285,10 @@ class WP_Widget_Archives extends WP_Widget {
} }
if ( $d ) { if ( $d ) {
$dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
?> ?>
<select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> <label class="screen-reader-text" for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo $title; ?></label>
<select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
<?php <?php
/** /**
* Filter the arguments for the Archives widget drop-down. * Filter the arguments for the Archives widget drop-down.
@ -576,10 +578,22 @@ class WP_Widget_Categories extends WP_Widget {
echo $args['before_title'] . $title . $args['after_title']; echo $args['before_title'] . $title . $args['after_title'];
} }
$cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h); $cat_args = array(
'orderby' => 'name',
'show_count' => $c,
'hierarchical' => $h
);
if ( $d ) { if ( $d ) {
$cat_args['show_option_none'] = __('Select Category'); static $first_dropdown = true;
$dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
$first_dropdown = false;
echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
$cat_args['show_option_none'] = __( 'Select Category' );
$cat_args['id'] = $dropdown_id;
/** /**
* Filter the arguments for the Categories widget drop-down. * Filter the arguments for the Categories widget drop-down.
@ -595,13 +609,15 @@ class WP_Widget_Categories extends WP_Widget {
<script type='text/javascript'> <script type='text/javascript'>
/* <![CDATA[ */ /* <![CDATA[ */
var dropdown = document.getElementById("cat"); (function() {
var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
function onCatChange() { function onCatChange() {
if ( dropdown.options[dropdown.selectedIndex].value > 0 ) { if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value; location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
} }
} }
dropdown.onchange = onCatChange; dropdown.onchange = onCatChange;
})();
/* ]]> */ /* ]]> */
</script> </script>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31519'; $wp_version = '4.2-alpha-31520';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.