Changeset 30871 for trunk

Timestamp:

12/15/2014 07:53:55 PM (8 years ago)

Author:

ocean90

Message:

Customizer: Import missing wp.customize.Control.prototype._toggleActive.

Check also if completeCallback is set before calling it.

props westonruter.
see #30701.

File:

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

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

@@ -253 +253 @@
                 // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
                 this.container.toggle( active );
-                args.completeCallback();
+                if ( args.completeCallback ) {
+                    args.completeCallback();
+                }
             } else if ( active ) {
                 this.container.stop( true, true ).slideDown( duration, args.completeCallback );
@@ -821 +823 @@
             inject = function ( sectionId ) {
                 var parentContainer;
-                if ( ! sectionId ) { // @todo allow a control to be embeded without a section, for instance a control embedded in the frontend
+                if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the frontend
                     return;
                 }
@@ -879 +881 @@
                 // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
                 this.container.toggle( active );
-                args.completeCallback();
+                if ( args.completeCallback ) {
+                    args.completeCallback();
+                }
             } else if ( active ) {
                 this.container.slideDown( args.duration, args.completeCallback );
@@ -913 +917 @@
          */
         deactivate: Container.prototype.deactivate,
+
+        /**
+         * Re-use _toggleActive from Container class.
+         *
+         * @access private
+         */
+        _toggleActive: Container.prototype._toggleActive,
 
         dropdownInit: function() {