Changeset 33134

Timestamp:

07/08/2015 08:41:18 PM (10 years ago)

Author:

westonruter

Message:

Customizer: Defer listening to nav menu setting changes until active.

Defer the preview starting to listen to setting changes until after the Customizer has synced settings into the preview. This ensures that any differences between the JS and PHP representations of the settings won't cause an infinite refresh.

See #32911.
Fixes #32894.

File:

• trunk/src/wp-includes/js/customize-preview-nav-menus.js (modified) (3 diffs)

trunk/src/wp-includes/js/customize-preview-nav-menus.js

@@ -10 +10 @@
         renderNoncePostKey: null,
         previewCustomizeNonce: null,
-        previewReady: $.Deferred(),
         requestUri: '/',
         theme: {
@@ -21 +20 @@
 
     api.bind( 'preview-ready', function() {
-        self.previewReady.resolve();
-    } );
-    self.previewReady.done( function() {
-        self.init();
+        api.preview.bind( 'active', function() {
+            self.init();
+        } );
     } );
 
@@ -37 +35 @@
         }
 
-        self.previewReady.done( function() {
-            api.each( function( setting, id ) {
+        api.each( function( setting, id ) {
+            setting.id = id;
+            self.bindListener( setting );
+        } );
+
+        api.preview.bind( 'setting', function( args ) {
+            var id, value, setting;
+            args = args.slice();
+            id = args.shift();
+            value = args.shift();
+            if ( ! api.has( id ) ) {
+                // Currently customize-preview.js is not creating settings for dynamically-created settings in the pane; so we have to do it
+                setting = api.create( id, value ); // @todo This should be in core
                 setting.id = id;
-                self.bindListener( setting );
-            } );
-
-            api.preview.bind( 'setting', function( args ) {
-                var id, value, setting;
-                args = args.slice();
-                id = args.shift();
-                value = args.shift();
-                if ( ! api.has( id ) ) {
-                    // Currently customize-preview.js is not creating settings for dynamically-created settings in the pane; so we have to do it
-                    setting = api.create( id, value ); // @todo This should be in core
-                    setting.id = id;
-                    if ( self.bindListener( setting ) ) {
-                        setting.callbacks.fireWith( setting, [ setting(), setting() ] );
-                    }
+                if ( self.bindListener( setting ) ) {
+                    setting.callbacks.fireWith( setting, [ setting(), null ] );
                 }
-            } );
+            }
         } );
     };