Changeset 42024

Timestamp:

10/25/2017 04:48:19 PM (7 years ago)

Author:

westonruter

Message:

Customize: Link elements prior to embedding to prevent possible errors when a control is associated with a non-existent section.

Fixes issue specifically with attempting to access an orphaned control's elements immediately after it has been added. Normally this would not happen because a control would not be registered without a section, and also a control should only be interacted with once its embedded deferred has been resolved.

Also harden logic for gathering list of deferred setting IDs.

See #37964.
Fixes #42330.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (3 diffs)

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

@@ -3475 +3475 @@
             _.extend( settings, control.params.settings );
 
-            // Note: Settings can be an array or an object.
-            _.each( settings, function( setting, key ) {
-                if ( _.isObject( setting ) ) { // @todo Or check if instance of api.Setting?
-                    control.settings[ key ] = setting;
-                } else {
-                    deferredSettingIds.push( setting );
+            // Note: Settings can be an array or an object, with values being either setting IDs or Setting (or Value) objects.
+            _.each( settings, function( value, key ) {
+                var setting;
+                if ( _.isObject( value ) && _.isFunction( value.extended ) && value.extended( api.Value ) ) {
+                    control.settings[ key ] = value;
+                } else if ( _.isString( value ) ) {
+                    setting = api( value );
+                    if ( setting ) {
+                        control.settings[ key ] = setting;
+                    } else {
+                        deferredSettingIds.push( value );
+                    }
                 }
             } );
@@ -3501 +3507 @@
                 control.setting = control.settings['default'] || null;
 
+                control.linkElements(); // Link initial elements present in server-rendered content.
                 control.embed();
             };
@@ -3512 +3519 @@
             // After the control is embedded on the page, invoke the "ready" method.
             control.deferred.embedded.done( function () {
-                control.linkElements();
+                control.linkElements(); // Link any additional elements after template is rendered by renderContent().
                 control.setupNotifications();
                 control.ready();