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

Accessibility: Make some Widgets buttons real buttons. 

Links used as UI controls that behave like buttons, should be buttons.
- changes the widgets "toggle", "Delete", and "Close" links to buttons
- uses `aria-expanded` to announce the state of the toggle buttons
- increases a bit the clickable area of the toggle
- ensures the "circular focus" doesn't get cut-off in some browsers by centering the toggle arrows
- uses a `<span>` element with an `aria-hidden` attribute to hide CSS generated font icons from assistive technologies
- standardizes on `.toggle-indicator:before` rather than `:after`
- changes two `#f00` reds in `#dc3232`, see #35622

Fixes #31476.

Built from https://develop.svn.wordpress.org/trunk@40480


git-svn-id: http://core.svn.wordpress.org/trunk@40356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2017-04-19 21:14:44 +00:00
parent 711796d172
commit 1d739a0925
26 changed files with 125 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wp-admin/css/common-rtl.css
View File

@ -865,8 +865,6 @@ hr {
border-bottom: 1px solid #fafafa; border-bottom: 1px solid #fafafa;
} }
.widget-control-remove,
.widget-control-remove:focus,
.row-actions span.delete a, .row-actions span.delete a,
.row-actions span.trash a, .row-actions span.trash a,
.row-actions span.spam a, .row-actions span.spam a,
@ -893,14 +891,10 @@ span.required,
#media-items a.delete:hover, #media-items a.delete:hover,
#media-items a.delete-permanently:hover, #media-items a.delete-permanently:hover,
#nav-menu-footer .menu-delete:hover { #nav-menu-footer .menu-delete:hover {
color: #f00; color: #dc3232;
border: none; border: none;
} }
.widget-control-remove:hover {
color: #f00;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
3.0 - Actions 3.0 - Actions
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -3244,25 +3238,24 @@ img {
/* @todo: can we use a common class for these? */ /* @todo: can we use a common class for these? */
.nav-menus-php .item-edit:before, .nav-menus-php .item-edit:before,
.widget-top a.widget-action:after, .widget-top .widget-action .toggle-indicator:before,
.control-section .accordion-section-title:after, .control-section .accordion-section-title:after,
.accordion-section-title:after { .accordion-section-title:after {
left: 0;
content: "\f140"; content: "\f140";
border: none;
background: none;
font: normal 20px/1 dashicons; font: normal 20px/1 dashicons;
speak: none; speak: none;
display: block; display: block;
padding: 0;
text-indent: 0;
text-align: center;
position: relative;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-decoration: none !important; text-decoration: none !important;
} }
.widget-top .widget-action .toggle-indicator:before {
padding: 1px 0px 1px 2px;
-webkit-border-radius: 50%;
border-radius: 50%;
}
.handlediv, .handlediv,
.postbox .handlediv.button-link, .postbox .handlediv.button-link,
.item-edit, .item-edit,
@ -3288,15 +3281,7 @@ img {
color: #23282d; color: #23282d;
} }
.widget-top a.widget-action:after { .widget-top .widget-action:focus .toggle-indicator:before {
padding: 1px 0px 1px 2px;
margin-top: 10px;
margin-left: 10px;
-webkit-border-radius: 50%;
border-radius: 50%;
}
.widget-top a.widget-action:focus:after {
-webkit-box-shadow: -webkit-box-shadow:
0 0 0 1px #5b9dd9, 0 0 0 1px #5b9dd9,
0 0 2px 1px rgba(30,140,190,.8); 0 0 2px 1px rgba(30,140,190,.8);
@ -3315,7 +3300,7 @@ img {
.control-section.open .accordion-section-title:after, .control-section.open .accordion-section-title:after,
#customize-info.open .accordion-section-title:after, #customize-info.open .accordion-section-title:after,
.nav-menus-php .menu-item-edit-active .item-edit:before, .nav-menus-php .menu-item-edit-active .item-edit:before,
.widget.open .widget-top a.widget-action:after { .widget.open .widget-top .widget-action .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
@ -3594,8 +3579,8 @@ img {
/* @todo: evaluate - most of these were likely replaced by dashicons */ /* @todo: evaluate - most of these were likely replaced by dashicons */
.curtime #timestamp, .curtime #timestamp,
#screen-meta-links a.show-settings, #screen-meta-links a.show-settings,
.widget-top a.widget-action, .widget-top .widget-action,
.widget-top a.widget-action:hover, .widget-top .widget-action:hover,
.sidebar-name-arrow, .sidebar-name-arrow,
.sidebar-name:hover .sidebar-name-arrow, .sidebar-name:hover .sidebar-name-arrow,
.meta-box-sortables .postbox:hover .handlediv, .meta-box-sortables .postbox:hover .handlediv,

4
wp-admin/css/common-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

39
wp-admin/css/common.css
View File

@ -865,8 +865,6 @@ hr {
border-bottom: 1px solid #fafafa; border-bottom: 1px solid #fafafa;
} }
.widget-control-remove,
.widget-control-remove:focus,
.row-actions span.delete a, .row-actions span.delete a,
.row-actions span.trash a, .row-actions span.trash a,
.row-actions span.spam a, .row-actions span.spam a,
@ -893,14 +891,10 @@ span.required,
#media-items a.delete:hover, #media-items a.delete:hover,
#media-items a.delete-permanently:hover, #media-items a.delete-permanently:hover,
#nav-menu-footer .menu-delete:hover { #nav-menu-footer .menu-delete:hover {
color: #f00; color: #dc3232;
border: none; border: none;
} }
.widget-control-remove:hover {
color: #f00;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
3.0 - Actions 3.0 - Actions
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -3244,25 +3238,24 @@ img {
/* @todo: can we use a common class for these? */ /* @todo: can we use a common class for these? */
.nav-menus-php .item-edit:before, .nav-menus-php .item-edit:before,
.widget-top a.widget-action:after, .widget-top .widget-action .toggle-indicator:before,
.control-section .accordion-section-title:after, .control-section .accordion-section-title:after,
.accordion-section-title:after { .accordion-section-title:after {
right: 0;
content: "\f140"; content: "\f140";
border: none;
background: none;
font: normal 20px/1 dashicons; font: normal 20px/1 dashicons;
speak: none; speak: none;
display: block; display: block;
padding: 0;
text-indent: 0;
text-align: center;
position: relative;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-decoration: none !important; text-decoration: none !important;
} }
.widget-top .widget-action .toggle-indicator:before {
padding: 1px 2px 1px 0px;
-webkit-border-radius: 50%;
border-radius: 50%;
}
.handlediv, .handlediv,
.postbox .handlediv.button-link, .postbox .handlediv.button-link,
.item-edit, .item-edit,
@ -3288,15 +3281,7 @@ img {
color: #23282d; color: #23282d;
} }
.widget-top a.widget-action:after { .widget-top .widget-action:focus .toggle-indicator:before {
padding: 1px 2px 1px 0px;
margin-top: 10px;
margin-right: 10px;
-webkit-border-radius: 50%;
border-radius: 50%;
}
.widget-top a.widget-action:focus:after {
-webkit-box-shadow: -webkit-box-shadow:
0 0 0 1px #5b9dd9, 0 0 0 1px #5b9dd9,
0 0 2px 1px rgba(30,140,190,.8); 0 0 2px 1px rgba(30,140,190,.8);
@ -3315,7 +3300,7 @@ img {
.control-section.open .accordion-section-title:after, .control-section.open .accordion-section-title:after,
#customize-info.open .accordion-section-title:after, #customize-info.open .accordion-section-title:after,
.nav-menus-php .menu-item-edit-active .item-edit:before, .nav-menus-php .menu-item-edit-active .item-edit:before,
.widget.open .widget-top a.widget-action:after { .widget.open .widget-top .widget-action .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
@ -3594,8 +3579,8 @@ img {
/* @todo: evaluate - most of these were likely replaced by dashicons */ /* @todo: evaluate - most of these were likely replaced by dashicons */
.curtime #timestamp, .curtime #timestamp,
#screen-meta-links a.show-settings, #screen-meta-links a.show-settings,
.widget-top a.widget-action, .widget-top .widget-action,
.widget-top a.widget-action:hover, .widget-top .widget-action:hover,
.sidebar-name-arrow, .sidebar-name-arrow,
.sidebar-name:hover .sidebar-name-arrow, .sidebar-name:hover .sidebar-name-arrow,
.meta-box-sortables .postbox:hover .handlediv, .meta-box-sortables .postbox:hover .handlediv,

4
wp-admin/css/common.min.css vendored
View File

File diff suppressed because one or more lines are too long

19
wp-admin/css/customize-nav-menus-rtl.css
View File

@ -153,7 +153,7 @@
text-align: center; text-align: center;
} }
.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after { .wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
@ -271,17 +271,18 @@
display: inline-block; display: inline-block;
font-size: 20px; font-size: 20px;
line-height: 1; line-height: 1;
text-indent: -1px; /* account for the dashicon alignment */
} }
.rtl .wp-customizer .toggle-indicator { .rtl .wp-customizer .toggle-indicator {
text-indent: 1px; /* account for the dashicon alignment */ text-indent: 1px; /* account for the dashicon alignment */
} }
.wp-customizer .toggle-indicator:after { .wp-customizer .menu-item .item-edit .toggle-indicator:before,
#available-menu-items .accordion-section-title .toggle-indicator:before {
content: "\f140"; content: "\f140";
display: block;
padding: 1px 0px 1px 2px;
speak: none; speak: none;
vertical-align: top;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
border-radius: 50%; border-radius: 50%;
color: #72777c; color: #72777c;
@ -494,13 +495,13 @@
content: none !important; content: none !important;
} }
#available-menu-items .accordion-section-title:hover .toggle-indicator:after, #available-menu-items .accordion-section-title:hover .toggle-indicator:before,
#available-menu-items .button-link:hover .toggle-indicator:after, #available-menu-items .button-link:hover .toggle-indicator:before,
#available-menu-items .button-link:focus .toggle-indicator:after { #available-menu-items .button-link:focus .toggle-indicator:before {
color: #23282d; color: #23282d;
} }
#available-menu-items .open .accordion-section-title .toggle-indicator:after { #available-menu-items .open .accordion-section-title .toggle-indicator:before {
content: "\f142"; content: "\f142";
color: #23282d; color: #23282d;
} }
@ -837,7 +838,7 @@ li.assigned-to-menu-location .add-new-menu-item {
.wp-customizer .menu-item .submitbox .submitdelete:focus, .wp-customizer .menu-item .submitbox .submitdelete:focus,
.customize-screen-options-toggle:focus:before, .customize-screen-options-toggle:focus:before,
#customize-controls .customize-info .customize-help-toggle:focus:before, #customize-controls .customize-info .customize-help-toggle:focus:before,
.wp-customizer button:focus .toggle-indicator:after, .wp-customizer button:focus .toggle-indicator:before,
.menu-delete:focus, .menu-delete:focus,
.menu-item-bar .item-delete:focus:before, .menu-item-bar .item-delete:focus:before,
#available-menu-items .item-add:focus:before { #available-menu-items .item-add:focus:before {

2
wp-admin/css/customize-nav-menus-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

19
wp-admin/css/customize-nav-menus.css
View File

@ -153,7 +153,7 @@
text-align: center; text-align: center;
} }
.wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:after { .wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
@ -271,17 +271,18 @@
display: inline-block; display: inline-block;
font-size: 20px; font-size: 20px;
line-height: 1; line-height: 1;
text-indent: -1px; /* account for the dashicon alignment */
} }
.rtl .wp-customizer .toggle-indicator { .rtl .wp-customizer .toggle-indicator {
text-indent: 1px; /* account for the dashicon alignment */ text-indent: 1px; /* account for the dashicon alignment */
} }
.wp-customizer .toggle-indicator:after { .wp-customizer .menu-item .item-edit .toggle-indicator:before,
#available-menu-items .accordion-section-title .toggle-indicator:before {
content: "\f140"; content: "\f140";
display: block;
padding: 1px 2px 1px 0px;
speak: none; speak: none;
vertical-align: top;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
border-radius: 50%; border-radius: 50%;
color: #72777c; color: #72777c;
@ -494,13 +495,13 @@
content: none !important; content: none !important;
} }
#available-menu-items .accordion-section-title:hover .toggle-indicator:after, #available-menu-items .accordion-section-title:hover .toggle-indicator:before,
#available-menu-items .button-link:hover .toggle-indicator:after, #available-menu-items .button-link:hover .toggle-indicator:before,
#available-menu-items .button-link:focus .toggle-indicator:after { #available-menu-items .button-link:focus .toggle-indicator:before {
color: #23282d; color: #23282d;
} }
#available-menu-items .open .accordion-section-title .toggle-indicator:after { #available-menu-items .open .accordion-section-title .toggle-indicator:before {
content: "\f142"; content: "\f142";
color: #23282d; color: #23282d;
} }
@ -837,7 +838,7 @@ li.assigned-to-menu-location .add-new-menu-item {
.wp-customizer .menu-item .submitbox .submitdelete:focus, .wp-customizer .menu-item .submitbox .submitdelete:focus,
.customize-screen-options-toggle:focus:before, .customize-screen-options-toggle:focus:before,
#customize-controls .customize-info .customize-help-toggle:focus:before, #customize-controls .customize-info .customize-help-toggle:focus:before,
.wp-customizer button:focus .toggle-indicator:after, .wp-customizer button:focus .toggle-indicator:before,
.menu-delete:focus, .menu-delete:focus,
.menu-item-bar .item-delete:focus:before, .menu-item-bar .item-delete:focus:before,
#available-menu-items .item-add:focus:before { #available-menu-items .item-add:focus:before {

2
wp-admin/css/customize-nav-menus.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-admin/css/customize-widgets-rtl.css
View File

@ -89,15 +89,15 @@
line-height: 16px; line-height: 16px;
} }
.customize-control-widget_form.expanded a.widget-action:after { .customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
.customize-control-widget_form.wide-widget-control a.widget-action:after { .customize-control-widget_form.wide-widget-control .widget-action .toggle-indicator:before {
content: "\f141"; content: "\f141";
} }
.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after { .customize-control-widget_form.wide-widget-control.expanded .widget-action .toggle-indicator:before {
content: "\f139"; content: "\f139";
} }
@ -438,9 +438,13 @@ body.adding-widget #customize-preview {
.last-widget { .last-widget {
margin-bottom: 15px; margin-bottom: 15px;
} }
/* This rule reduces the widgets titles height. */
.widget-title h3 { .widget-title h3 {
padding: 13px 15px; padding: 13px 15px;
} }
.widget-top .widget-action {
padding-bottom: 8px;
}
.widget-reorder-nav span { .widget-reorder-nav span {
height: 39px; height: 39px;
} }

2
wp-admin/css/customize-widgets-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-admin/css/customize-widgets.css
View File

@ -89,15 +89,15 @@
line-height: 16px; line-height: 16px;
} }
.customize-control-widget_form.expanded a.widget-action:after { .customize-control-widget_form.expanded .widget-action .toggle-indicator:before {
content: "\f142"; content: "\f142";
} }
.customize-control-widget_form.wide-widget-control a.widget-action:after { .customize-control-widget_form.wide-widget-control .widget-action .toggle-indicator:before {
content: "\f139"; content: "\f139";
} }
.customize-control-widget_form.wide-widget-control.expanded a.widget-action:after { .customize-control-widget_form.wide-widget-control.expanded .widget-action .toggle-indicator:before {
content: "\f141"; content: "\f141";
} }
@ -438,9 +438,13 @@ body.adding-widget #customize-preview {
.last-widget { .last-widget {
margin-bottom: 15px; margin-bottom: 15px;
} }
/* This rule reduces the widgets titles height. */
.widget-title h3 { .widget-title h3 {
padding: 13px 15px; padding: 13px 15px;
} }
.widget-top .widget-action {
padding-bottom: 8px;
}
.widget-reorder-nav span { .widget-reorder-nav span {
height: 39px; height: 39px;
} }

2
wp-admin/css/customize-widgets.min.css vendored
View File

File diff suppressed because one or more lines are too long

13
wp-admin/css/widgets-rtl.css
View File

@ -14,12 +14,13 @@
background: #f7f7f7; background: #f7f7f7;
} }
.widget-top a.widget-action, .widget-top .widget-action {
.widget-top a.widget-action:hover { border: 0;
-webkit-box-shadow: none; margin: 0;
box-shadow: none; padding: 10px;
background: none;
cursor: pointer;
outline: none; outline: none;
text-decoration: none;
} }
.widget-title h3, .widget-title h3,
@ -50,7 +51,7 @@
} }
.deleting .widget-title, .deleting .widget-title,
.deleting .widget-top a.widget-action:after { .deleting .widget-top .widget-action .toggle-indicator:before {
color: #a0a5aa; color: #a0a5aa;
} }

2
wp-admin/css/widgets-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

13
wp-admin/css/widgets.css
View File

@ -14,12 +14,13 @@
background: #f7f7f7; background: #f7f7f7;
} }
.widget-top a.widget-action, .widget-top .widget-action {
.widget-top a.widget-action:hover { border: 0;
-webkit-box-shadow: none; margin: 0;
box-shadow: none; padding: 10px;
background: none;
cursor: pointer;
outline: none; outline: none;
text-decoration: none;
} }
.widget-title h3, .widget-title h3,
@ -50,7 +51,7 @@
} }
.deleting .widget-title, .deleting .widget-title,
.deleting .widget-top a.widget-action:after { .deleting .widget-top .widget-action .toggle-indicator:before {
color: #a0a5aa; color: #a0a5aa;
} }

2
wp-admin/css/widgets.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
wp-admin/includes/widgets.php
View File

@ -219,7 +219,10 @@ function wp_widget_control( $sidebar_args ) {
echo $sidebar_args['before_widget']; ?> echo $sidebar_args['before_widget']; ?>
<div class="widget-top"> <div class="widget-top">
<div class="widget-title-action"> <div class="widget-title-action">
<a class="widget-action hide-if-no-js" href="#available-widgets"></a> <button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
<span class="screen-reader-text"><?php printf( __( 'Edit widget: %s' ), $widget_title ); ?></span>
<span class="toggle-indicator" aria-hidden="true"></span>
</button>
<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>"> <a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span> <span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
<span class="add"><?php _ex( 'Add', 'widget' ); ?></span> <span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
@ -250,8 +253,8 @@ function wp_widget_control( $sidebar_args ) {
<div class="widget-control-actions"> <div class="widget-control-actions">
<div class="alignleft"> <div class="alignleft">
<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> | <button type="button" class="button-link button-link-delete widget-control-remove"><?php _e( 'Delete' ); ?></button> |
<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a> <button type="button" class="button-link widget-control-close"><?php _e( 'Close' ); ?></button>
</div> </div>
<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>"> <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
<?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?> <?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>

10
wp-admin/js/customize-widgets.js
View File

@ -952,7 +952,7 @@
var self = this, $removeBtn, replaceDeleteWithRemove; var self = this, $removeBtn, replaceDeleteWithRemove;
// Configure remove button // Configure remove button
$removeBtn = this.container.find( 'a.widget-control-remove' ); $removeBtn = this.container.find( '.widget-control-remove' );
$removeBtn.on( 'click', function( e ) { $removeBtn.on( 'click', function( e ) {
e.preventDefault(); e.preventDefault();
@ -988,7 +988,7 @@
} ); } );
replaceDeleteWithRemove = function() { replaceDeleteWithRemove = function() {
$removeBtn.text( l10n.removeBtnLabel ); // wp_widget_control() outputs the link as "Delete" $removeBtn.text( l10n.removeBtnLabel ); // wp_widget_control() outputs the button as "Delete"
$removeBtn.attr( 'title', l10n.removeBtnTooltip ); $removeBtn.attr( 'title', l10n.removeBtnTooltip );
}; };
@ -1367,7 +1367,7 @@
* @param {Object} args merged on top of this.defaultActiveArguments * @param {Object} args merged on top of this.defaultActiveArguments
*/ */
onChangeExpanded: function ( expanded, args ) { onChangeExpanded: function ( expanded, args ) {
var self = this, $widget, $inside, complete, prevComplete, expandControl; var self = this, $widget, $inside, complete, prevComplete, expandControl, $toggleBtn;
self.embedWidgetControl(); // Make sure the outer form is embedded so that the expanded state can be set in the UI. self.embedWidgetControl(); // Make sure the outer form is embedded so that the expanded state can be set in the UI.
if ( expanded ) { if ( expanded ) {
@ -1386,6 +1386,7 @@
$widget = this.container.find( 'div.widget:first' ); $widget = this.container.find( 'div.widget:first' );
$inside = $widget.find( '.widget-inside:first' ); $inside = $widget.find( '.widget-inside:first' );
$toggleBtn = this.container.find( '.widget-top button.widget-action' );
expandControl = function() { expandControl = function() {
@ -1399,6 +1400,7 @@
complete = function() { complete = function() {
self.container.removeClass( 'expanding' ); self.container.removeClass( 'expanding' );
self.container.addClass( 'expanded' ); self.container.addClass( 'expanded' );
$toggleBtn.attr( 'aria-expanded', 'true' );
self.container.trigger( 'expanded' ); self.container.trigger( 'expanded' );
}; };
if ( args.completeCallback ) { if ( args.completeCallback ) {
@ -1428,10 +1430,10 @@
expandControl(); expandControl();
} }
} else { } else {
complete = function() { complete = function() {
self.container.removeClass( 'collapsing' ); self.container.removeClass( 'collapsing' );
self.container.removeClass( 'expanded' ); self.container.removeClass( 'expanded' );
$toggleBtn.attr( 'aria-expanded', 'false' );
self.container.trigger( 'collapsed' ); self.container.trigger( 'collapsed' );
}; };
if ( args.completeCallback ) { if ( args.completeCallback ) {

2
wp-admin/js/customize-widgets.min.js vendored
View File

File diff suppressed because one or more lines are too long

31
wp-admin/js/widgets.js
View File

@ -41,7 +41,8 @@ wpWidgets = {
$(document.body).bind('click.widgets-toggle', function(e) { $(document.body).bind('click.widgets-toggle', function(e) {
var target = $(e.target), var target = $(e.target),
css = { 'z-index': 100 }, css = { 'z-index': 100 },
widget, inside, targetWidth, widgetWidth, margin; widget, inside, targetWidth, widgetWidth, margin,
toggleBtn = target.closest( '.widget' ).find( '.widget-top button.widget-action' );
if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) { if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) {
widget = target.closest('div.widget'); widget = target.closest('div.widget');
@ -60,10 +61,21 @@ wpWidgets = {
css[ margin ] = widgetWidth - ( targetWidth + 30 ) + 'px'; css[ margin ] = widgetWidth - ( targetWidth + 30 ) + 'px';
widget.css( css ); widget.css( css );
} }
widget.addClass( 'open' ); /*
inside.slideDown('fast'); * Don't change the order of attributes changes and animation:
* it's important for screen readers, see ticket #31476.
*/
toggleBtn.attr( 'aria-expanded', 'true' );
inside.slideDown( 'fast', function() {
widget.addClass( 'open' );
});
} else { } else {
inside.slideUp('fast', function() { /*
* Don't change the order of attributes changes and animation:
* it's important for screen readers, see ticket #31476.
*/
toggleBtn.attr( 'aria-expanded', 'false' );
inside.slideUp( 'fast', function() {
widget.attr( 'style', '' ); widget.attr( 'style', '' );
widget.removeClass( 'open' ); widget.removeClass( 'open' );
}); });
@ -78,6 +90,7 @@ wpWidgets = {
} else if ( target.hasClass('widget-control-close') ) { } else if ( target.hasClass('widget-control-close') ) {
widget = target.closest('div.widget'); widget = target.closest('div.widget');
widget.removeClass( 'open' ); widget.removeClass( 'open' );
toggleBtn.attr( 'aria-expanded', 'false' );
wpWidgets.close( widget ); wpWidgets.close( widget );
e.preventDefault(); e.preventDefault();
} else if ( target.attr( 'id' ) === 'inactive-widgets-control-remove' ) { } else if ( target.attr( 'id' ) === 'inactive-widgets-control-remove' ) {
@ -92,7 +105,7 @@ wpWidgets = {
wpWidgets.appendTitle( this ); wpWidgets.appendTitle( this );
if ( $this.find( 'p.widget-error' ).length ) { if ( $this.find( 'p.widget-error' ).length ) {
$this.find( 'a.widget-action' ).trigger('click'); $this.find( '.widget-action' ).trigger( 'click' ).attr( 'aria-expanded', 'true' );
} }
}); });
@ -182,6 +195,7 @@ wpWidgets = {
if ( inside.css('display') === 'block' ) { if ( inside.css('display') === 'block' ) {
ui.item.removeClass('open'); ui.item.removeClass('open');
ui.item.find( '.widget-top button.widget-action' ).attr( 'aria-expanded', 'false' );
inside.hide(); inside.hide();
$(this).sortable('refreshPositions'); $(this).sortable('refreshPositions');
} }
@ -254,7 +268,7 @@ wpWidgets = {
} }
if ( addNew ) { if ( addNew ) {
$widget.find( 'a.widget-action' ).trigger('click'); $widget.find( '.widget-action' ).trigger( 'click' );
} else { } else {
wpWidgets.saveOrder( $sidebar.attr('id') ); wpWidgets.saveOrder( $sidebar.attr('id') );
} }
@ -492,7 +506,10 @@ wpWidgets = {
close : function(widget) { close : function(widget) {
widget.children('.widget-inside').slideUp('fast', function() { widget.children('.widget-inside').slideUp('fast', function() {
widget.attr( 'style', '' ); widget.attr( 'style', '' )
.find( '.widget-top button.widget-action' )
.attr( 'aria-expanded', 'false' )
.focus();
}); });
}, },

2
wp-admin/js/widgets.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/buttons-rtl.css
View File

@ -242,7 +242,7 @@ TABLE OF CONTENTS:
.wp-core-ui .button-link-delete:hover, .wp-core-ui .button-link-delete:hover,
.wp-core-ui .button-link-delete:focus { .wp-core-ui .button-link-delete:focus {
color: #f00; color: #dc3232;
} }
.ie8 .wp-core-ui .button-link:focus { .ie8 .wp-core-ui .button-link:focus {

2
wp-includes/css/buttons-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/buttons.css
View File

@ -242,7 +242,7 @@ TABLE OF CONTENTS:
.wp-core-ui .button-link-delete:hover, .wp-core-ui .button-link-delete:hover,
.wp-core-ui .button-link-delete:focus { .wp-core-ui .button-link-delete:focus {
color: #f00; color: #dc3232;
} }
.ie8 .wp-core-ui .button-link:focus { .ie8 .wp-core-ui .button-link:focus {

2
wp-includes/css/buttons.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.8-alpha-40479'; $wp_version = '4.8-alpha-40480';
/** /**
* 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.