Changeset 30214 for trunk/src/wp-includes/class-wp-customize-control.php

Timestamp:

11/03/2014 09:34:44 PM (11 years ago)

Author:

ocean90

Message:

Customizer: Add stable sorting for panels, sections and controls in JS. Improve sorting in PHP.

props westonruter.
fixes #30225.

File:

• trunk/src/wp-includes/class-wp-customize-control.php (modified) (3 diffs)

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

@@ -8 +8 @@
  */
 class WP_Customize_Control {
+
+    /**
+     * Incremented with each new class instantiation, then stored in $instance_number.
+     *
+     * Used when sorting two instances whose priorities are equal.
+     *
+     * @since 4.1.0
+     * @access protected
+     * @var int
+     */
+    protected static $instance_count = 0;
+
+    /**
+     * Order in which this instance was created in relation to other instances.
+     *
+     * @since 4.1.0
+     * @access public
+     * @var int
+     */
+    public $instance_number;
+
     /**
      * @access public
@@ -128 +149 @@
             $this->active_callback = array( $this, 'active_callback' );
         }
+        self::$instance_count += 1;
+        $this->instance_number = self::$instance_count;
 
         // Process settings.
@@ -219 +242 @@
         }
 
-        $this->json['type']        = $this->type;
-        $this->json['priority']    = $this->priority;
-        $this->json['active']      = $this->active();
-        $this->json['section']     = $this->section;
-        $this->json['content']     = $this->get_content();
-        $this->json['label']       = $this->label;
+        $this->json['type'] = $this->type;
+        $this->json['priority'] = $this->priority;
+        $this->json['active'] = $this->active();
+        $this->json['section'] = $this->section;
+        $this->json['content'] = $this->get_content();
+        $this->json['label'] = $this->label;
         $this->json['description'] = $this->description;
+        $this->json['instanceNumber'] = $this->instance_number;
     }