Ticket #32941: 32941.3.diff

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

@@ -3327 +3327 @@
                                 var self = this,
                                         processing = api.state( 'processing' ),
                                         submitWhenDoneProcessing,
-                                        submit;
+                                        submit,
+                                        modifiedWhileSaving = {};
 
                                 body.addClass( 'saving' );
 
+                                function captureSettingModifiedDuringSave( setting ) {
+                                        modifiedWhileSaving[ setting.id ] = true;
+                                }
+                                api.bind( 'change', captureSettingModifiedDuringSave );
+
                                 submit = function () {
                                         var request, query;
                                         query = $.extend( self.query(), {
@@ -3338 +3344 @@
                                         } );
                                         request = wp.ajax.post( 'customize_save', query );
 
+                                        // Disable save button during the save request.
+                                        saveBtn.prop( 'disabled', true );
+
                                         api.trigger( 'save', request );
 
                                         request.always( function () {
                                                 body.removeClass( 'saving' );
+                                                saveBtn.prop( 'disabled', false );
+                                                api.unbind( 'change', captureSettingModifiedDuringSave );
                                         } );
 
                                         request.fail( function ( response ) {
@@ -3365 +3376 @@
                                         } );
 
                                         request.done( function( response ) {
-                                                // Clear setting dirty states
-                                                api.each( function ( value ) {
-                                                        value._dirty = false;
+
+                                                // Clear setting dirty states, if setting wasn't modified while saving.
+                                                api.each( function( setting ) {
+                                                        if ( ! modifiedWhileSaving[ setting.id ] ) {
+                                                                setting._dirty = false;
+                                                        }
                                                 } );
 
                                                 api.previewer.send( 'saved', response );
 
                                                 api.trigger( 'saved', response );
+
+                                                // Restore the global dirty state if any settings were modified during save.
+                                                if ( ! _.isEmpty( modifiedWhileSaving ) ) {
+                                                        api.state( 'saved' ).set( false );
+                                                }
                                         } );
                                 };