Ticket #23449: 23449.14.diff

wp-admin/css/wp-admin-rtl.css

@@ -2708 +2708 @@
         font-family: Tahoma, Arial, sans-serif;
 }
 
-.accordion-section-title:after {
+.js .accordion-section-title:after {
         right: auto;
         left: 20px;
 }

wp-admin/css/wp-admin.css

@@ -7490 +7490 @@
         margin: 0;
 }
 
-.accordion-container .accordion-section:first-child {
+#nav-menu-meta .accordion-container .top {
+        border-top: 1px solid #dfdfdf;
+}
+
+#nav-menu-meta .accordion-container .accordion-section:first-child,
+#nav-menu-meta .accordion-container .accordion-section:first-child h3,
+#nav-menu-meta .accordion-container .top,
+#nav-menu-meta .accordion-container .top h3 {
         -webkit-border-top-right-radius: 3px;
         -webkit-border-top-left-radius: 3px;
         border-top-right-radius: 3px;
         border-top-left-radius: 3px;
 }
 
-.accordion-container .accordion-section:last-child {
+#nav-menu-meta .accordion-container .accordion-section:last-child,
+#nav-menu-meta .accordion-container .accordion-section:last-child .accordion-section-content,
+#nav-menu-meta .accordion-container .bottom,
+#nav-menu-meta .accordion-container .bottom:not(.open) h3 {
         -webkit-border-bottom-right-radius: 3px;
         -webkit-border-bottom-left-radius: 3px;
         border-bottom-right-radius: 3px;
@@ -8965 +8975 @@
         user-select: none;
 }
 
-.accordion-section-title:after {
+.js .accordion-section-title:after {
         content: '';
         width: 0;
         height: 0;

wp-admin/includes/template.php

@@ -985 +985 @@
 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

@@ -1 @@
-jQuery(document).ready( function($) {
-        // Expand/Collapse
-        $('.accordion-container').on( 'click keydown', '.accordion-section-title', function(e) {
-                if ( e.type === 'keydown' && 13 !== e.which ) // "return" key
-                                return;
-                e.preventDefault(); // Keep this AFTER the key filter above
+( function( $ ){
 
-                var section = $( this ).closest( '.accordion-section' ),
-                    siblings = section.siblings( '.open' ),
-                    content = section.find( '.accordion-section-content' );
+        $( document ).ready( function () {
 
-                if ( section.hasClass('cannot-expand') )
+                // Expand/Collapse on click
+                $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) {
+                        if ( e.type === 'keydown' && 13 !== e.which ) // "return" key
+                                        return;
+                        e.preventDefault(); // Keep this AFTER the key filter above
+
+                        accordionSwitch( $( this ) );
+                        accordionCorners();
+                });
+
+                // Refresh selected accordion option when screen options are toggled
+                $( '.hide-postbox-tog' ).click( function () {
+                        accordionInit();
+                });
+
+        });
+
+        var accordionOptions = $( '.accordion-container li.accordion-section' ),
+                sectionContent   = $( '.accordion-section-content' );
+
+        // Rounded corners
+        function accordionCorners () {
+                accordionOptions.removeClass( 'top bottom' );
+                accordionOptions.filter( ':visible' ).first().addClass( 'top' );
+                accordionOptions.filter( ':visible' ).last().addClass( 'bottom' ).find( sectionContent ).addClass('bottom');
+        };
+
+        function accordionInit () {
+                accordionSwitch( accordionOptions.filter( ':visible' ).first() );
+                accordionCorners();
+        }
+
+        function accordionSwitch ( el ) {
+                var section = el.closest( '.accordion-section' ),
+                    siblings = section.parent().find( '.open' ),
+                    content = section.find( sectionContent );
+
+                if ( section.hasClass( 'cannot-expand' ) )
                         return;
 
                 siblings.removeClass( 'open' );
-                siblings.find( '.accordion-section-content' ).show().slideUp( 150 );
+                siblings.find( sectionContent ).show().slideUp( 150 );
                 content.toggle( section.hasClass( 'open' ) ).slideToggle( 150 );
                 section.toggleClass( 'open' );
-        });
-});
+        }
+
+        // Show the first accordion option by default
+        accordionInit();
+
+})(jQuery);

wp-admin/js/nav-menu.js

@@ -53 +53 @@
                         this.initAccessibility();
 
                         this.initToggles();
-
-                        // Open first accordion option
-                        this.initAccordion();
                 },
 
                 jQueryExtensions : function() {
@@ -267 +264 @@
                         });
                 },
 
-                initAccordion : function() {
-                        var accordionOptions = $( '.accordion-container li.accordion-section' );
-                        accordionOptions.removeClass('open');
-                        accordionOptions.filter(':visible').first().addClass( 'open' );
-                },
-
                 countMenuItems : function( depth ) {
                         return $( '.menu-item-depth-' + depth ).length;
                 },
@@ -544 +535 @@
                         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/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' );