Ticket #38797: 38797.3.patch

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

@@ -3653 +3653 @@
                         };
 
                         // Debounce to prevent hammering server and then wait for any pending update requests.
-                        previewer.refresh = _.debounce(
-                                ( function( originalRefresh ) {
-                                        return function() {
-                                                var isProcessingComplete, refreshOnceProcessingComplete;
-                                                isProcessingComplete = function() {
-                                                        return 0 === api.state( 'processing' ).get();
-                                                };
-                                                if ( isProcessingComplete() ) {
-                                                        originalRefresh.call( previewer );
-                                                } else {
-                                                        refreshOnceProcessingComplete = function() {
-                                                                if ( isProcessingComplete() ) {
-                                                                        originalRefresh.call( previewer );
-                                                                        api.state( 'processing' ).unbind( refreshOnceProcessingComplete );
-                                                                }
-                                                        };
-                                                        api.state( 'processing' ).bind( refreshOnceProcessingComplete );
-                                                }
-                                        };
-                                }( previewer.refresh ) ),
-                                previewer.refreshBuffer
-                        );
+                        previewer.refresh = function() {
+        var isProcessingComplete,
+            refreshOnceProcessingComplete,
+            dfd = $.Deferred(),
+            _resolveRefresh = function( processing ) {
+              api.Previewer.prototype.refresh.call( previewer )
+                .done( function( server_data ) {
+                    dfd.resolve( server_data );
+                } )
+                .fail( function( reason ) {
+                    dfd.resolve( reason );
+                } )
+                .always( function() {
+                  if ( true === processing.unbind ) {
+                    api.state( 'processing' ).unbind( refreshOnceProcessingComplete );
+                  }
+                });
+            };
+        setTimeout( function() {
+          isProcessingComplete = function() {
+            return 0 === api.state( 'processing' ).get();
+          };
+          if ( isProcessingComplete() ) {
+            _resolveRefresh( { unbind : false } );
+          } else {
+            refreshOnceProcessingComplete = function() {
+              if ( isProcessingComplete() ) {
+                _resolveRefresh( { unbind : true });
+              }
+            };
+            api.state( 'processing' ).bind( refreshOnceProcessingComplete );
+          }
+        }, previewer.refreshBuffer );//setTimeout
+        return dfd.promise();
+      };//previewer.refresh
+
+
 
                         previewer.container   = api.ensure( params.container );
                         previewer.allowedUrls = params.allowedUrls;
@@ -3925 +3940 @@
                  * @returns {void}
                  */
                 refresh: function() {
-                        var previewer = this, onSettingChange;
+                        var previewer = this, onSettingChange, dfd = $.Deferred();
 
                         // Display loading indicator
                         previewer.send( 'loading-initiated' );
@@ -3955 +3970 @@
                                 previewer.targetWindow( loadingFrame.targetWindow() );
                                 previewer.channel( loadingFrame.channel() );
 
-                                onceSynced = function() {
+                                onceSynced = function( server_data ) {
                                         loadingFrame.unbind( 'synced', onceSynced );
                                         if ( previewer._previousPreview ) {
                                                 previewer._previousPreview.destroy();
@@ -3963 +3978 @@
                                         previewer._previousPreview = previewer.preview;
                                         previewer.deferred.active.resolve();
                                         delete previewer.loading;
+          dfd.resolve( server_data );
                                 };
                                 loadingFrame.bind( 'synced', onceSynced );
 
@@ -3985 +4001 @@
                                 if ( 'cheatin' === reason ) {
                                         previewer.cheatin();
                                 }
+        dfd.reject( reason );
                         });
+      return dfd.promise();
                 },
 
                 login: function() {

src/wp-includes/js/customize-preview.js

@@ -733 +733 @@
                         $.each( events, function( event, args ) {
                                 api.preview.trigger( event, args );
                         });
-                        api.preview.send( 'synced' );
+                        api.server_data = api.server_data || new api.Value( {} );
+      api.trigger( 'before_synced', api.server_data() );//<= developers can set the api.server_data() here, before it gets sent
+      api.preview.send( 'synced', api.server_data() );
                 });
 
                 api.preview.bind( 'active', function() {