Changeset 41960

Timestamp:

10/21/2017 08:43:36 AM (6 years ago)

Author:

westonruter

Message:

Customize: Allow control subclasses to add to the deferred object before the base class initializes.

Update the CodeEditorControl's codemirror deferred to be set before calling the parent class's initialize method. Since the ready method may be called directly by initialize it may be too late to add a new Deferred to the control's deferred property after calling the base control class's initialize.

Amends [41958].
See #41897.

File:

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

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

@@ -3420 +3420 @@
             }
 
-            control.deferred = {
+            control.deferred = _.extend( control.deferred || {}, {
                 embedded: new $.Deferred()
-            };
+            } );
             control.section = new api.Value();
             control.priority = new api.Value();
@@ -5128 +5128 @@
         initialize: function( id, options ) {
             var control = this;
-            api.Control.prototype.initialize.call( this, id, options );
-            control.deferred.codemirror = $.Deferred();
+            control.deferred = _.extend( control.deferred || {}, {
+                codemirror: $.Deferred()
+            } );
+            api.Control.prototype.initialize.call( control, id, options );
         },