Changeset 31520 for trunk/src/wp-includes/default-widgets.php

Timestamp:

02/23/2015 04:31:31 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Add missing labels to Archives and Categories dropdown widgets.

props joedolson, jlevandowski, DrewAPicture, SergeyBiryukov.
fixes #18650.

File:

• trunk/src/wp-includes/default-widgets.php (modified) (3 diffs)

trunk/src/wp-includes/default-widgets.php

@@ -286 +286 @@
 
         if ( $d ) {
-?>
-        <select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+            $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
+?>
+        <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
             /**
@@ -577 +579 @@
         }
 
-        $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
+        $cat_args = array(
+            'orderby'      => 'name',
+            'show_count'   => $c,
+            'hierarchical' => $h
+        );
 
         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;
 
             /**
@@ -596 +610 @@
 <script type='text/javascript'>
 /* <![CDATA[ */
-    var dropdown = document.getElementById("cat");
+(function() {
+    var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
     function onCatChange() {
-        if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
-            location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
+        if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
+            location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
         }
     }
     dropdown.onchange = onCatChange;
+})();
 /* ]]> */
 </script>