<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30214] trunk/src: Customizer: Add stable sorting for panels, sections and controls in JS.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30214">30214</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30214","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-03 21:34:44 +0000 (Mon, 03 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Add stable sorting for panels, sections and controls in JS. Improve sorting in PHP.
props westonruter.
fixes <a href="https://core.trac.wordpress.org/ticket/30225">#30225</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizepanelphp">trunk/src/wp-includes/class-wp-customize-panel.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesectionphp">trunk/src/wp-includes/class-wp-customize-section.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2014-11-03 19:32:10 UTC (rev 30213)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-11-03 21:34:44 UTC (rev 30214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* globals _wpCustomizeHeader, _wpMediaViewsL10n */
</span><span class="cx" style="display: block; padding: 0 10px"> (function( exports, $ ){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var bubbleChildValueChanges, Container, focus, isKeydownButNotEnterEvent, areElementListsEqual, api = wp.customize;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var bubbleChildValueChanges, Container, focus, isKeydownButNotEnterEvent, areElementListsEqual, prioritySort, api = wp.customize;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo Move private helper functions to wp.customize.utils so they can be unit tested
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Stable sort for Panels, Sections, and Controls.
+ *
+ * If a.priority() === b.priority(), then sort by their respective params.instanceNumber.
+ *
+ * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} a
+ * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} b
+ * @returns {Number}
+ */
+ prioritySort = function ( a, b ) {
+ if ( a.priority() === b.priority() && typeof a.params.instanceNumber === 'number' && typeof b.params.instanceNumber === 'number' ) {
+ return a.params.instanceNumber - b.params.instanceNumber;
+ } else {
+ return a.priority() - b.priority();
+ }
+ };
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Return whether the supplied Event object is for a keydown event but not the Enter key.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {jQuery.Event} event
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,9 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> children.push( child );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- children.sort( function ( a, b ) {
- return a.priority() - b.priority();
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ children.sort( prioritySort );
</ins><span class="cx" style="display: block; padding: 0 10px"> return children;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1952,9 +1967,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort the root panels and sections
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rootNodes.sort( function ( a, b ) {
- return a.priority() - b.priority();
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rootNodes.sort( prioritySort );
</ins><span class="cx" style="display: block; padding: 0 10px"> rootContainers = _.pluck( rootNodes, 'container' );
</span><span class="cx" style="display: block; padding: 0 10px"> appendContainer = $( '#customize-theme-controls' ).children( 'ul' ); // @todo This should be defined elsewhere, and to be configurable
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! areElementListsEqual( rootContainers, appendContainer.children() ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2014-11-03 19:32:10 UTC (rev 30213)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-11-03 21:34:44 UTC (rev 30214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Customize_Control {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var int
+ */
+ public $instance_number;
+
+ /**
+ * @access public
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Customize_Manager
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $manager;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,6 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->active_callback ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->active_callback = array( $this, 'active_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$instance_count += 1;
+ $this->instance_number = self::$instance_count;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Process settings.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->settings ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,13 +241,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->json['settings'][ $key ] = $setting->id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->json['description'] = $this->description;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->json['instanceNumber'] = $this->instance_number;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2014-11-03 19:32:10 UTC (rev 30213)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2014-11-03 21:34:44 UTC (rev 30214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,28 +856,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_control_templates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->registered_control_types as $control_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->registered_control_types as $control_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $control = new $control_type( $this, 'temp', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $control->print_template();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Helper function to compare two objects by priority.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Helper function to compare two objects by priority, ensuring sort stability via instance_number.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $a Object A.
- * @param object $b Object B.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $a Object A.
+ * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $b Object B.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected final function _cmp_priority( $a, $b ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ap = $a->priority;
- $bp = $b->priority;
-
- if ( $ap == $bp )
- return 0;
- return ( $ap > $bp ) ? 1 : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $a->priority === $b->priority ) {
+ return $a->instance_number - $a->instance_number;
+ } else {
+ return $a->priority - $b->priority;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,8 +890,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_controls() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->controls = array_reverse( $this->controls );
</del><span class="cx" style="display: block; padding: 0 10px"> $controls = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uasort( $this->controls, array( $this, '_cmp_priority' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->controls as $id => $control ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,8 +904,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->controls = $controls;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare sections.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reversing makes uasort sort by time added when conflicts occur.
- $this->sections = array_reverse( $this->sections );
</del><span class="cx" style="display: block; padding: 0 10px"> uasort( $this->sections, array( $this, '_cmp_priority' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $sections = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,8 +927,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sections = $sections;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare panels.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reversing makes uasort sort by time added when conflicts occur.
- $this->panels = array_reverse( $this->panels );
</del><span class="cx" style="display: block; padding: 0 10px"> uasort( $this->panels, array( $this, '_cmp_priority' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $panels = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-panel.php 2014-11-03 19:32:10 UTC (rev 30213)
+++ trunk/src/wp-includes/class-wp-customize-panel.php 2014-11-03 21:34:44 UTC (rev 30214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Customize_Panel {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WP_Customize_Manager instance.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,6 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->active_callback ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->active_callback = array( $this, 'active_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$instance_count += 1;
+ $this->instance_number = self::$instance_count;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sections = array(); // Users cannot customize the $sections array.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,6 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'type' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $array['content'] = $this->get_content();
</span><span class="cx" style="display: block; padding: 0 10px"> $array['active'] = $this->active();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $array['instanceNumber'] = $this->instance_number;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-section.php 2014-11-03 19:32:10 UTC (rev 30213)
+++ trunk/src/wp-includes/class-wp-customize-section.php 2014-11-03 21:34:44 UTC (rev 30214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Customize_Section {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * WP_Customize_Manager instance.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +157,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->active_callback ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->active_callback = array( $this, 'active_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$instance_count += 1;
+ $this->instance_number = self::$instance_count;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->controls = array(); // Users cannot customize the $controls array.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,6 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'panel', 'type' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $array['content'] = $this->get_content();
</span><span class="cx" style="display: block; padding: 0 10px"> $array['active'] = $this->active();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $array['instanceNumber'] = $this->instance_number;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>