Changeset 40816 for trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php

Timestamp:

05/22/2017 08:23:49 PM (9 years ago)

Author:

afercia

Message:

Widgets: Remove the title attributes used in the Tag cloud widget.

• improves accessibility using an aria-label attribute to match the information conveyed visually with the one exposed to assistive technologies
• adds an option in the widget to display the item counts, consistently with what other widgets already do (Archives, Categories)

Props adamsoucie, emirpprime, Samantha Miller., MikeLittle, rianrietveld, sami.keijonen, adamsilverstein, westonruter, afercia.
See #24766.
Fixes #35566.

File:

• trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php (modified) (7 diffs)

trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php

@@ -54 +54 @@
                 }
 
+                $show_count = ! empty( $instance['count'] );
+
                 /**
                  * Filters the taxonomy used in the Tag Cloud widget.
@@ -65 +67 @@
                  */
                 $tag_cloud = wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
-                        'taxonomy' => $current_taxonomy,
-                        'echo' => false
+                        'taxonomy'   => $current_taxonomy,
+                        'echo'       => false,
+                        'show_count' => $show_count,
                 ) ) );
 
@@ -103 +106 @@
                 $instance = array();
                 $instance['title'] = sanitize_text_field( $new_instance['title'] );
+                $instance['count'] = ! empty( $new_instance['count'] ) ? 1 : 0;
                 $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
                 return $instance;
@@ -118 +122 @@
                 $current_taxonomy = $this->_get_current_taxonomy($instance);
                 $title_id = $this->get_field_id( 'title' );
+                $count = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
                 $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 
@@ -129 +134 @@
                 $input = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />';
 
+                $count_checkbox = sprintf(
+                        '<p><input type="checkbox" class="checkbox" id="%1$s" name="%2$s"%3$s /> <label for="%1$s">%4$s</label></p>',
+                        $this->get_field_id( 'count' ),
+                        $this->get_field_name( 'count' ),
+                        checked( $count, true, false ),
+                        __( 'Show tag counts' )
+                );
+
                 switch ( count( $taxonomies ) ) {
 
@@ -137 +150 @@
                         break;
 
-                // Just a single tag cloud supporting taxonomy found, no need to display options
+                // Just a single tag cloud supporting taxonomy found, no need to display a select.
                 case 1:
                         $keys = array_keys( $taxonomies );
                         $taxonomy = reset( $keys );
                         printf( $input, esc_attr( $taxonomy ) );
+                        echo $count_checkbox;
                         break;
 
-                // More than one tag cloud supporting taxonomy found, display options
+                // More than one tag cloud supporting taxonomy found, display a select.
                 default:
                         printf(
@@ -163 +177 @@
                         }
 
-                        echo '</select></p>';
+                        echo '</select></p>' . $count_checkbox;
                 }
         }