Changeset 31918

Timestamp:

03/28/2015 10:08:32 PM (11 years ago)

Author:

ocean90

Message:

Theme Switcher: Use the global panel back button instead of adding a new one.

This ensures the back button is visible on iOS devices. Same as in [29610].

see #31794.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (1 diff)
• wp-admin/js/customize-controls.js (modified) (3 diffs)
• wp-includes/class-wp-customize-section.php (modified) (1 diff)

trunk/src/wp-admin/css/customize-controls.css

@@ -946 +946 @@
 }
 
-.themes-panel-back:before {
-        top: 13px;
+.in-themes-panel .control-panel-back:before {
+        content: "\f345";
         left: 14px;
 }
 
-.in-themes-panel .themes-panel-back {
+.in-themes-panel .control-panel-back {
         left: 0;
 }
 
-.in-sub-panel .themes-panel-back {
-        display: none;
-}
-
-.control-panel-back.themes-panel-back:before {
-        content: "\f345";
+.in-themes-panel .control-panel-back:before {
 }
 

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

@@ -599 +599 @@
                         });
 
-                        section.container.find( '.themes-panel-back' ).on( 'click keydown', function( event ) {
+
+                        $( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) {
                                 if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
                                         return;
@@ -606 +607 @@
                                 event.preventDefault(); // Keep this AFTER the key filter above
 
-                                section.collapse();
+                                if ( section.expanded() ) {
+                                        section.collapse();
+                                }
                         });
 
@@ -692 +695 @@
                                 siblings = container.find( '.open' ),
                                 topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ),
-                                backBtn = overlay.find( '.themes-panel-back' ),
+                                backBtn = overlay.find( '.control-panel-back' ),
                                 panelTitle = section.find( '.accordion-section-title' ).first(),
                                 content = section.find( '.control-panel-content' );

trunk/src/wp-includes/class-wp-customize-section.php

@@ -346 +346 @@
                                 <span class="screen-reader-text"><?php _e( 'Press return or enter to expand' ); ?></span>
                         </h3>
-                        <span class="control-panel-back themes-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
                         <div class="customize-themes-panel control-panel-content themes-php">
                                 <h2><?php esc_html_e( 'Themes' ); ?>