WordPress.org
Get WordPress

Make WordPress Core

Ticket #29135: 29135.diff

File 29135.diff, 3.0 KB (added by celloexpressions, 12 years ago)

Use a universal back button in the header for all panels

Line 
1Index: src/wp-admin/css/customize-controls.css
2===================================================================
3--- src/wp-admin/css/customize-controls.css (revision 29574)
4+++ src/wp-admin/css/customize-controls.css (working copy)
5@@ -250,8 +252,8 @@
6 font: normal 20px/1 dashicons;
7 content: "\f341";
8 position: relative;
9- top: 13px;
10+ top: 7px;
11 left: 13px;
12 }
13
14 .rtl .control-panel-back:before {
15@@ -258,7 +260,7 @@
16 content: "\f344";
17 }
18
19-.current-panel .control-panel-back {
20+.in-sub-panel .control-panel-back {
21 left: 0;
22 }
23
24Index: src/wp-admin/customize.php
25===================================================================
26--- src/wp-admin/customize.php (revision 29574)
27+++ src/wp-admin/customize.php (working copy)
28@@ -121,6 +121,7 @@
29 <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
30 <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
31 </a>
32+ <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
33 </div>
34
35 <?php
36Index: src/wp-admin/js/accordion.js
37===================================================================
38--- src/wp-admin/js/accordion.js (revision 29574)
39+++ src/wp-admin/js/accordion.js (working copy)
40@@ -47,7 +47,7 @@
41 });
42
43 // Go back to the top-level Customizer accordion.
44- $( '.accordion-container' ).on( 'click keydown', '.control-panel-back', function( e ) {
45+ $( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( e ) {
46 if ( e.type === 'keydown' && 13 !== e.which ) { // "return" key
47 return;
48 }
49@@ -54,7 +54,7 @@
50
51 e.preventDefault(); // Keep this AFTER the key filter above
52
53- panelSwitch( $( this ) );
54+ panelSwitch( $( '.current-panel' ) );
55 });
56 });
57
58@@ -108,7 +108,7 @@
59 container = section.closest( '.accordion-container' ),
60 siblings = container.find( '.open' ),
61 topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ),
62- backBtn = section.find( '.control-panel-back' ),
63+ backBtn = overlay.find( '.control-panel-back' ),
64 panelTitle = section.find( '.accordion-section-title' ).first(),
65 content = section.find( '.control-panel-content' );
66
67Index: src/wp-includes/class-wp-customize-panel.php
68===================================================================
69--- src/wp-includes/class-wp-customize-panel.php (revision 29574)
70+++ src/wp-includes/class-wp-customize-panel.php (working copy)
71@@ -174,7 +174,6 @@
72 <?php echo esc_html( $this->title ); ?>
73 <span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
74 </h3>
75- <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
76 <ul class="accordion-sub-container control-panel-content">
77 <li class="accordion-section control-section<?php if ( empty( $this->description ) ) echo ' cannot-expand'; ?>">
78 <div class="accordion-section-title" tabindex="0">