Ticket #25439: 25439.1.diff

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

@@ -1128 +1128 @@
                         });
                 });
 
+                // Prompt user with AYS dialog if leaving the Customizer with unsaved changes
+                $( window ).on( 'beforeunload', function () {
+                        if ( ! api.state( 'saved' )() ) {
+                                return api.l10n.saveAlert;
+                        }
+                } );
+
                 // Pass events through to the parent.
-                api.bind( 'saved', function() {
-                        parent.send( 'saved' );
-                });
+                $.each( [ 'saved', 'change' ], function ( i, event ) {
+                        api.bind( event, function() {
+                                parent.send( event );
+                        });
+                } );
 
                 // When activated, let the loader handle redirecting the page.
                 // If no loader exists, redirect the page ourselves (if a url exists).

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

@@ -63 +63 @@
                                 Loader.close();
                 },
 
+                beforeunload: function () {
+                        if ( ! Loader.saved() ) {
+                                return Loader.settings.l10n.saveAlert;
+                        }
+                },
+
                 open: function( src ) {
                         var hash;
 
                         if ( this.active )
                                 return;
 
+                        this.saved = new api.Value( true );
+
                         // Load the full page on mobile devices.
                         if ( Loader.settings.browser.mobile )
                                 return window.location = src;
@@ -100 +108 @@
                                         Loader.close();
                         });
 
+                        // Prompt AYS dialog when navigating away
+                        $( window ).on( 'beforeunload', this.beforeunload );
+
                         this.messenger.bind( 'activated', function( location ) {
                                 if ( location )
                                         window.location = location;
                         });
 
+                        this.messenger.bind( 'saved', function () {
+                                Loader.saved( true );
+                        } );
+                        this.messenger.bind( 'change', function () {
+                                Loader.saved( false );
+                        } );
+
                         hash = src.split('?')[1];
 
                         // Ensure we don't call pushState if the user hit the forward button.
@@ -137 +155 @@
                         Loader.messenger.destroy();
                         Loader.iframe    = null;
                         Loader.messenger = null;
+                        Loader.saved     = null;
                         Loader.body.removeClass( 'customize-active full-overlay-active' ).removeClass( 'customize-loading' );
+                        $( window ).off( 'beforeunload', Loader.beforeunload );
                 },
 
                 loaded: function() {

src/wp-includes/script-loader.php

@@ -381 +381 @@
         did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
                 'activate'  => __( 'Save & Activate' ),
                 'save'      => __( 'Save & Publish' ),
+                'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
                 'saved'     => __( 'Saved' ),
                 'cancel'    => __( 'Cancel' ),
                 'close'     => __( 'Close' ),

src/wp-includes/theme.php

@@ -1874 +1874 @@
                 'url'           => esc_url( admin_url( 'customize.php' ) ),
                 'isCrossDomain' => $cross_domain,
                 'browser'       => $browser,
+                'l10n'          => array(
+                        'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+                ),
         );
 
         $script = 'var _wpCustomizeLoaderSettings = ' . json_encode( $settings ) . ';';