Changeset 29488

Timestamp:

08/14/2014 04:42:30 AM (12 years ago)

Author:

nacin

Message:

Customizer: Mixed priority sorting for panels and top-level sections.

props celloexpressions.
fixes #28979.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (1 diff)
• wp-admin/customize.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• wp-includes/class-wp-customize-widgets.php (modified) (1 diff)

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

@@ -133 +133 @@
 
 #customize-theme-controls .control-section:last-of-type.open,
-#customize-theme-controls .control-section:last-of-type .accordion-section-title {
+#customize-theme-controls .control-section:last-of-type > .accordion-section-title {
         border-bottom-color: #ddd;
 }

trunk/src/wp-admin/customize.php

@@ -162 +162 @@
                         <div id="customize-theme-controls"><ul>
                                 <?php
-                                foreach ( $wp_customize->panels() as $panel ) {
-                                        $panel->maybe_render();
-                                }
-                                foreach ( $wp_customize->sections() as $section ) {
-                                        $section->maybe_render();
+                                foreach ( $wp_customize->containers() as $container ) {
+                                        $container->maybe_render();
                                 }
                                 ?>

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -44 +44 @@
         public $widgets;
 
-        protected $settings = array();
-        protected $panels   = array();
-        protected $sections = array();
-        protected $controls = array();
+        protected $settings   = array();
+        protected $containers = array();
+        protected $panels     = array();
+        protected $sections   = array();
+        protected $controls   = array();
 
         protected $nonce_tick;
@@ -304 +305 @@
         public function controls() {
                 return $this->controls;
+        }
+
+        /**
+         * Get the registered containers.
+         *
+         * @since 4.0.0
+         *
+         * @return array
+         */
+        public function containers() {
+                return $this->containers;
         }
 
@@ -892 +904 @@
                 }
                 $this->panels = $panels;
+
+                // Sort panels and top-level sections together.
+                $this->containers = array_merge( $this->panels, $this->sections );
+                uasort( $this->containers, array( $this, '_cmp_priority' ) );
         }
 

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -435 +435 @@
 
                 $this->manager->add_panel( 'widgets', array(
-                        'title' => __( 'Widgets' ),
+                        'title'       => __( 'Widgets' ),
                         'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
+                        'priority'    => 110,
                 ) );