Ticket #27403: 27403-persistent-shortcuts.2.diff

src/wp-admin/customize.php

@@ -192 +192 @@
                                 <?php endforeach; ?>
                         </div>
                         <?php endif; ?>
-                        <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+                        <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Hide Controls' ); ?>">
                                 <span class="collapse-sidebar-arrow"></span>
-                                <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                                <span class="collapse-sidebar-label"><?php _e( 'Hide Controls' ); ?></span>
                         </button>
                 </div>
         </form>

src/wp-admin/js/customize-controls.js

@@ -5207 +5207 @@
                         expandedPanel( false );
                         expandedSection( false );
                         previewerAlive( true );
-                        editShortcutVisibility( 'initial' );
+                        editShortcutVisibility( 'visible' );
 
                         api.bind( 'change', function() {
                                 state('saved').set( false );
@@ -5813 +5813 @@
                 });
 
                 // Update the edit shortcut visibility state.
+                api.state( 'paneVisible' ).bind( function( isPaneVisible ) {
+                        var isMobileScreen;
+                        if ( window.matchMedia ) {
+                                isMobileScreen = window.matchMedia( 'screen and ( max-width: 640px )' ).matches;
+                        } else {
+                                isMobileScreen = $( window ).width() <= 640;
+                        }
+                        api.state( 'editShortcutVisibility' ).set( isPaneVisible || isMobileScreen ? 'visible' : 'hidden' );
+                } );
+                if ( window.matchMedia ) {
+                        window.matchMedia( 'screen and ( max-width: 640px )' ).addListener( function() {
+                                var state = api.state( 'paneVisible' );
+                                state.callbacks.fireWith( state, [ state.get(), state.get() ] );
+                        } );
+                }
                 api.previewer.bind( 'edit-shortcut-visibility', function( visibility ) {
                         api.state( 'editShortcutVisibility' ).set( visibility );
                 } );

src/wp-includes/css/customize-preview.css

@@ -80 +80 @@
         pointer-events: none;
 }
 
-body.customize-partial-edit-shortcuts-flash .customize-partial-edit-shortcut:before {
-        animation-duration: 1.5s;
-        animation-delay: 0.4s;
-        animation-name: customize-partial-edit-shortcut-bounce-disappear;
-        pointer-events: none;
-}
-
 .page-sidebar-collapsed .customize-partial-edit-shortcut:before,
 .customize-partial-edit-shortcut-hidden:before {
         visibility: hidden;

src/wp-includes/js/customize-selective-refresh.js

@@ -996 +996 @@
                         shouldAnimateHide = ( 'hidden' === visibility && body.hasClass( 'customize-partial-edit-shortcuts-shown' ) && ! body.hasClass( 'customize-partial-edit-shortcuts-hidden' ) );
                         body.toggleClass( 'customize-partial-edit-shortcuts-hidden', shouldAnimateHide );
                         body.toggleClass( 'customize-partial-edit-shortcuts-shown', 'visible' === visibility );
-                        body.toggleClass( 'customize-partial-edit-shortcuts-flash', 'initial' === visibility );
                 } );
 
                 api.preview.bind( 'active', function() {
@@ -1022 +1021 @@
                         self.partial.bind( 'add', function( partial ) {
                                 partial.deferred.ready.resolve();
                         } );
-
-                        body.on( 'click', function( event ) {
-                                if ( event.shiftKey || $( event.target ).is( '.customize-partial-edit-shortcut, :input, button *, a[href], a[href] *, object, object *, [tabindex], [tabindex] *' ) ) {
-                                        return; // Don't toggle shortcuts on shift-clicks or clicks on (or in) interactive elements.
-                                }
-                                api.selectiveRefresh.editShortcutVisibility.set( 'visible' === api.selectiveRefresh.editShortcutVisibility.get() ? 'hidden' : 'visible' );
-                                api.preview.send( 'edit-shortcut-visibility', api.selectiveRefresh.editShortcutVisibility.get() );
-                        } );
                 } );
 
         } );

src/wp-includes/script-loader.php

@@ -465 +465 @@
                 'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
                 'previewIframeTitle' => __( 'Site Preview' ),
                 'loginIframeTitle'   => __( 'Session expired' ),
-                'collapseSidebar'    => __( 'Collapse Sidebar' ),
-                'expandSidebar'      => __( 'Expand Sidebar' ),
+                'collapseSidebar'    => __( 'Hide Controls' ),
+                'expandSidebar'      => __( 'Show Controls' ),
                 'untitledBlogName'   => __( '(Untitled)' ),
                 // Used for overriding the file types allowed in plupload.
                 'allowedFiles'       => __( 'Allowed Files' ),