Changeset 33599

Timestamp:

08/09/2015 06:59:34 PM (9 years ago)

Author:

ocean90

Message:

Customizer: Remove obsolete .control-panel-back and .customize-overlay-close buttons.

props afercia, ocean90.
see #31336.
fixes #33229.

Location:

trunk/src/wp-admin

Files:

• css/customize-controls.css (modified) (9 diffs)
• customize.php (modified) (1 diff)
• js/customize-controls.js (modified) (1 diff)
• js/customize-widgets.js (modified) (1 diff)

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

@@ -40 +40 @@
 #customize-header-actions {
     border-bottom: 1px solid #ddd;
-}
-
-#customize-header-actions .secondary-actions {
-    display: none;
 }
 
@@ -274 +270 @@
 }
 
-.section-open .control-panel-back {
-    display: none;
-}
-
 .accordion-sub-container.control-panel-content {
     display: none;
@@ -301 +293 @@
 }
 
-.customize-overlay-close,
 .customize-controls-close {
     display: block;
@@ -323 +314 @@
 }
 
-.customize-overlay-close {
-    left: auto;
-    right: 0;
-    border-right: 0;
-    border-left: 1px solid #ddd;
-}
-
-.control-panel-back {
-    display: block;
-    position: fixed;
-    top: 0;
-    z-index: 99;
-    left: -48px;
-    width: 45px;
-    height: 45px;
-    padding-right: 2px;
-    background: #eee;
-    border-right: 1px solid #ddd;
-    cursor: pointer;
-    -webkit-transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-    transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
-}
-
 .customize-panel-back,
 .customize-section-back {
@@ -368 +336 @@
 }
 
-.ios .control-panel-back,
 .ios .customize-panel-back,
 .ios .customize-section-back {
@@ -375 +342 @@
 }
 
-.collapsed .control-panel-back,
 .ios .customize-panel-back {
     display: none;
@@ -393 +359 @@
 }
 
-.customize-overlay-close:focus,
-.customize-overlay-close:hover,
 .customize-controls-close:focus,
 .customize-controls-close:hover,
-.control-panel-back:focus,
-.control-panel-back:hover,
 .customize-controls-preview-toggle:focus,
 .customize-controls-preview-toggle:hover {
@@ -420 +382 @@
 }
 
-.customize-overlay-close:before,
 .customize-controls-close:before {
     font: normal 22px/45px dashicons;
@@ -434 +395 @@
     content: "\f341";
     position: relative;
-    left: 13px;
-}
-
-.control-panel-back:before {
-    font: normal 20px/45px dashicons;
-    content: "\f341";
-    position: relative;
-    top: 1px;
     left: 13px;
 }

trunk/src/wp-admin/customize.php

@@ -124 +124 @@
     <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
         <div id="customize-header-actions" class="wp-full-overlay-header">
-            <div class="primary-actions">
-                <?php
-                    $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-                    submit_button( $save_text, 'primary save', 'save', false );
-                ?>
-                <span class="spinner"></span>
-                <a class="customize-controls-preview-toggle" href="#">
-                    <span class="controls"><?php _e( 'Customize' ); ?></span>
-                    <span class="preview"><?php _e( 'Preview' ); ?></span>
-                </a>
-                <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
-                    <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
-                </a>
-                <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
-            </div>
-            <div class="secondary-actions">
-                <button type="button" class="customize-overlay-close">
-                    <span class="screen-reader-text"><?php _e( 'Close overlay' ); ?></span>
-                </button>
-            </div>
+            <?php
+            $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
+            submit_button( $save_text, 'primary save', 'save', false );
+            ?>
+            <span class="spinner"></span>
+            <a class="customize-controls-preview-toggle" href="#">
+                <span class="controls"><?php _e( 'Customize' ); ?></span>
+                <span class="preview"><?php _e( 'Preview' ); ?></span>
+            </a>
+            <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
+                <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
+            </a>
         </div>
 

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

@@ -3389 +3389 @@
         });
 
-        // Go back to the top-level Customizer accordion.
-        $( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) {
-            if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
-                return;
-            }
-
-            event.preventDefault(); // Keep this AFTER the key filter above
-            api.panel.each( function ( panel ) {
-                panel.collapse();
-            });
-        });
-
         closeBtn.keydown( function( event ) {
             if ( 9 === event.which ) // tab

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

@@ -178 +178 @@
             // interacted with (i.e. available widgets panel is blurred) then close the
             // available widgets panel. Also close on back button click.
-            $( '#customize-controls, .customize-overlay-close, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {
+            $( '#customize-controls, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {
                 var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' );
                 if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) {