Ticket #31575: 31575.3.patch

src/wp-admin/css/press-this.css

@@ -1185 +1185 @@
         vertical-align: middle;
 }
 
-.options-open,
-.options-close {
+.options,
+.options.open .on-closed,
+.options.closed .on-open {
         display: none;
 }
 
 @media (max-width: 900px) {
-        .options-open,
-        .options-close {
+        .options {
                 display: block;
         }
 }
 
-.options-open.is-hidden,
-.options-close.is-hidden,
 .options-panel-back.is-hidden {
         display: none;
 }
 
-.options-open:focus .dashicons {
+.options:focus .dashicons {
         color: #fff;
         text-decoration: none;
 }
 
-.options-open .dashicons {
+.options .dashicons {
         margin-top: 3px;
 }
 
-.options-close {
+.options {
         color: #2ea2cc;
 }
 

src/wp-admin/includes/class-wp-press-this.php

@@ -1201 +1201 @@
                                 <span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
                         </a>
                 </h1>
-                <button type="button" class="options-open button-subtle">
-                        <span class="dashicons dashicons-tag"></span><span class="screen-reader-text"><?php _e( 'Show post options' ); ?></span>
+                <button type="button" class="options button-subtle closed">
+                        <span class="dashicons dashicons-tag on-closed"></span>
+                        <span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
+                        <span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
+                        <span class="screen-reader-text on-open"><?php _e( 'Hide post options' ); ?></span>
                 </button>
-                <button type="button" class="options-close button-subtle is-hidden"><?php _e( 'Done' ); ?></button>
         </div>
 
         <div id="scanbar" class="scan">
@@ -1273 +1275 @@
                 </div>
 
                 <div class="options-panel-back is-hidden" tabindex="-1"></div>
-                <div class="options-panel is-off-screen is-hidden" tabindex="-1">
+                <div class="options-panel is-off-screen is-hidden" tabindex="-1" aria-expanded="false">
                         <div class="post-options">
 
                                 <?php if ( $supports_formats ) : ?>

src/wp-admin/js/press-this.js

@@ -286 +286 @@
                         if ( data.hasData ) {
                                 $( '#scanbar' ).hide();
                         }
+
+                        if ( $( window ).width() > 900 ) {
+                                $( '.options-panel' ).attr( 'aria-expanded', 'true' );
+                        }
                 }
 
                 /**
@@ -474 +478 @@
                 function openSidebar() {
                         sidebarIsOpen = true;
 
-                        $( '.options-open, .press-this-actions, #scanbar' ).addClass( isHidden );
-                        $( '.options-close, .options-panel-back' ).removeClass( isHidden );
+                        $( '.options' ).removeClass( 'closed' ).addClass( 'open' );
+                        $( '.press-this-actions, #scanbar' ).addClass( isHidden );
+                        $( '.options-panel-back' ).removeClass( isHidden );
 
                         $( '.options-panel' ).removeClass( offscreenHidden )
-                                .one( 'transitionend', function() {
+                                .attr( 'aria-expanded', 'true' )
+                                .one( transitionEndEvent, function() {
                                         $( '.post-option:first' ).focus();
                                 } );
                 }
@@ -486 +492 @@
                 function closeSidebar() {
                         sidebarIsOpen = false;
 
-                        $( '.options-close, .options-panel-back' ).addClass( isHidden );
-                        $( '.options-open, .press-this-actions, #scanbar' ).removeClass( isHidden );
+                        $( '.options' ).removeClass( 'open' ).addClass( 'closed' );
+                        $( '.options-panel-back' ).addClass( isHidden );
+                        $( '.press-this-actions, #scanbar' ).removeClass( isHidden );
 
                         $( '.options-panel' ).addClass( isOffScreen )
-                                .one( 'transitionend', function() {
+                                .attr( 'aria-expanded', 'false' )
+                                .one( transitionEndEvent, function() {
                                         $( this ).addClass( isHidden );
                                         // Reset to options list
                                         $( '.post-options' ).removeClass( offscreenHidden );
@@ -598 +606 @@
                         monitorPlaceholder();
                         monitorCatList();
 
-                        $( '.options-open' ).on( 'click.press-this', openSidebar );
-                        $( '.options-close' ).on( 'click.press-this', closeSidebar );
+                        $( '.options' ).on( 'click.press-this', function() {
+                                if ( $( this ).hasClass( 'open' ) ) {
+                                        closeSidebar();
+                                } else {
+                                        openSidebar();
+                                }
+                        });
 
                         // Close the sidebar when focus moves outside of it.
                         $( '.options-panel, .options-panel-back' ).on( 'focusout.press-this', function() {
@@ -610 +623 @@
                                         if ( sidebarIsOpen && node && ! $node.hasClass( 'options-panel-back' ) &&
                                                 ( node.nodeName === 'BODY' ||
                                                         ( ! $node.closest( '.options-panel' ).length &&
-                                                        ! $node.closest( '.options-open' ).length ) ) ) {
+                                                        ! $node.closest( '.options' ).length ) ) ) {
 
                                                 closeSidebar();
                                         }