Changeset 42048

Timestamp:

10/31/2017 02:58:42 AM (7 years ago)

Author:

westonruter

Message:

Customize: Consolidate sourcing of control params.

Prevent needlessly iterating over controlConstructor to find type when it is already supplied.

Amends [41750], [41726].
See #42083.

File:

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

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

@@ -3467 +3467 @@
             var control = this, deferredSettingIds = [], settings, gatherSettings;
 
-            control.params = _.extend( {}, control.defaults );
+            control.params = _.extend(
+                {},
+                control.defaults,
+                control.params || {}, // In case sub-class already defines.
+                options.params || options || {} // The options.params property is deprecated, but it is checked first for back-compat.
+            );
 
             if ( ! api.Control.instanceCounter ) {
@@ -3488 +3493 @@
             }
 
-            _.extend( control.params, options.params || options );
             if ( ! control.params.content ) {
                 control.params.content = $( '<li></li>', {