Ticket #23449: 23449.3.diff

wp-admin/includes/template.php

@@ -986 +986 @@
 function do_accordion_sections( $screen, $context, $object ) {
         global $wp_meta_boxes;
 
+        wp_enqueue_script( 'accordion' );
+
         if ( empty( $screen ) )
                 $screen = get_current_screen();
         elseif ( is_string( $screen ) )

wp-admin/js/accordion.js

@@ -14 +14 @@
                 clicked.toggleClass( 'open' );
                 event.preventDefault();
         });
-});
-jQuery(document).ready( function($) {
-        // Expand/Collapse
-        $('.accordion-section-title').on('click keydown', function( event ) {
-
-                if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                return;
-
-                var clicked = $( this ).closest( '.accordion-section' );
-
-                if ( clicked.hasClass('cannot-expand') )
-                        return;
-
-                clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
-                clicked.toggleClass( 'open' );
-                event.preventDefault();
+        // Refresh selected accordion option when screen options are toggled
+        $('.hide-postbox-tog').click(function () {
+                accordion.init();
         });
+        // Show the first accordion option by default
+        accordion.init();
 });
-jQuery(document).ready( function($) {
-        // Expand/Collapse
-        $('.accordion-section-title').on('click keydown', function( event ) {
-
-                if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                return;
-
-                var clicked = $( this ).closest( '.accordion-section' );
-
-                if ( clicked.hasClass('cannot-expand') )
-                        return;
-
-                clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
-                clicked.toggleClass( 'open' );
-                event.preventDefault();
-        });
-});
- No newline at end of file
+(function($){
+        accordion = {
+                init : function() {
+                        var accordionOptions = $( '.accordion-container li.accordion-section' );
+                        accordionOptions.removeClass('open');
+                        accordionOptions.filter(':visible').first().addClass( 'open' );
+                }
+        };
+})(jQuery);
+ No newline at end of file

wp-admin/js/nav-menu.js

@@ -51 +51 @@
                         this.initAccessibility();
 
                         this.initToggles();
-
-                        // Open first accordion option
-                        this.initAccordion();
                 },
 
                 jQueryExtensions : function() {
@@ -265 +262 @@
                         });
                 },
 
-                initAccordion : function() {
-                        var accordionOptions = $( '.accordion-container li.accordion-section' );
-                        accordionOptions.removeClass('open');
-                        accordionOptions.filter(':visible').first().addClass( 'open' );
-                },
-
                 initAccessibility : function() {
                         $( '.item-edit' ).off( 'focus' ).on( 'focus', function(){
                                 $(this).on( 'keydown', function(e){
@@ -402 +393 @@
                         api.menuList.hideAdvancedMenuItemFields();
 
                         $('.hide-postbox-tog').click(function () {
-                                api.initAccordion();
-
                                 var hidden = $( '.accordion-container li.accordion-section' ).filter(':hidden').map(function() { return this.id; }).get().join(',');
                                 $.post(ajaxurl, {
                                         action: 'closed-postboxes',

wp-admin/js/postbox.js

@@ -144 +144 @@
                         });
 
                         if ( side.length ) {
+                                if ($('#postbox-container-1').find('accordion-container'))
+                                        return;
+
                                 if ( side.children('.postbox:visible').length )
                                         side.removeClass('empty-container');
                                 else if ( $('#postbox-container-1').css('width') == '280px' )

wp-admin/nav-menus.php

@@ -23 +23 @@
         wp_die( __( 'Cheatin’ uh?' ) );
 
 wp_enqueue_script( 'nav-menu' );
-wp_enqueue_script( 'accordion' );
 
 if ( wp_is_mobile() )
         wp_enqueue_script( 'jquery-touch-punch' );

wp-admin/css/wp-admin.css

@@ -7221 +7221 @@
         margin: 13px 0;
 }
 
-#nav-menu-meta .accordion-section-content {
-        padding: 18px 13px;
-}
-
 #nav-menu-meta .button-controls {
         margin-bottom: 0;
 }
@@ -8889 +8885 @@
 
 .accordion-section-content {
         display: none;
-        padding: 10px 20px 15px;
+        padding: 8px 13px 13px;
         overflow: hidden;
 }
 
+#submitdiv .accordion-section-content {
+        padding: 0;
+}
+
 .accordion-section-title {
         margin: 0;
         padding: 15px 20px;
@@ -8937 +8937 @@
         display: none;
 }
 
-.control-section .accordion-section-title {
+.control-section .accordion-section-title,
+#poststuff .control-section .accordion-section-title {
         padding: 10px 20px;
         font-size: 15px;
         font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
@@ -8963 +8964 @@
 .control-section:hover .accordion-section-title,
 .control-section .accordion-section-title:hover,
 .control-section.open .accordion-section-title,
-.control-section .accordion-section-title:focus {
+.control-section .accordion-section-title:focus,
+#poststuff .control-section:hover .accordion-section-title,
+#poststuff .control-section .accordion-section-title:hover,
+#poststuff .control-section.open .accordion-section-title,
+#poststuff .control-section .accordion-section-title:focus {
         color: #fff;
         text-shadow: 0 -1px 0 #333;
         background: #808080;