Ticket #23449: 23449.6.diff

wp-admin/includes/template.php

@@ -984 +984 @@
  */
 function do_accordion_sections( $screen, $context, $object ) {
         global $wp_meta_boxes;
+        
+        if ( ! wp_script_is( 'accordion', 'queue' ) )
+                wp_enqueue_script( 'accordion' );
 
         if ( empty( $screen ) )
                 $screen = get_current_screen();

wp-admin/js/accordion.js

@@ -18 +18 @@
                 section.toggleClass( 'open' );
         });
 });
+
+// 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(); 
+         
+(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

@@ -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' );

wp-admin/css/wp-admin.css

@@ -7438 +7438 @@
         margin: 0;
 }
 
-.accordion-container .accordion-section:first-child {
+#nav-menu-meta .accordion-container .accordion-section:first-child { 
         -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 { 
         -webkit-border-bottom-right-radius: 3px;
         -webkit-border-bottom-left-radius: 3px;
         border-bottom-right-radius: 3px;