Ticket #31196: 31196.8.diff

src/wp-admin/css/themes.css

@@ -1357 +1357 @@
         height: 100%;
 }
 
+#customize-preview.wp-full-overlay-main {
+        background: url(../images/spinner.gif) no-repeat;
+        -webkit-background-size: 20px 20px;
+        background-size: 20px 20px;
+        background-position: center center;
+}
+#customize-preview.wp-full-overlay-main.iframe-ready {
+        background: none;
+}
+
 .wp-full-overlay-sidebar .wp-full-overlay-header {
         position: absolute;
         left: 0;

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

@@ -1466 +1466 @@
                         this.bind( 'ready', this._ready );
 
                         this.bind( 'ready', function ( data ) {
+
+                                this.container.addClass( 'iframe-ready' );
+
                                 if ( ! data ) {
                                         return;
                                 }
@@ -1769 +1772 @@
                 refresh: function() {
                         var self = this;
 
+                        // Display loading indicator
+                        this.send( 'loading-initiated' );
+
                         this.abort();
 
                         this.loading = new api.PreviewFrame({
@@ -1801 +1807 @@
                         });
 
                         this.loading.fail( function( reason, location ) {
-                                if ( 'redirect' === reason && location )
+                                self.send( 'loading-failed' );
+                                if ( 'redirect' === reason && location ) {
                                         self.previewUrl( location );
+                                }
 
                                 if ( 'logged out' === reason ) {
                                         if ( self.preview ) {
@@ -1813 +1821 @@
                                         self.login().done( self.refresh );
                                 }
 
-                                if ( 'cheatin' === reason )
+                                if ( 'cheatin' === reason ) {
                                         self.cheatin();
+                                }
                         });
                 },
 

src/wp-includes/class-wp-customize-manager.php

@@ -432 +432 @@
                 add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
                 add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
                 add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
+                add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
                 add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
                 add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
                 add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
@@ -491 +492 @@
                 <![endif]--><?php
         }
 
+        public function customize_preview_loading_style() {
+                ?><style>
+                        body.wp-customizer-unloading {
+                                opacity: 0.25;
+                                cursor: progress !important;
+                                -webkit-transition: opacity 0.5s;
+                                transition: opacity 0.5s;
+                        }
+                        body.wp-customizer-unloading * {
+                                pointer-events: none !important;
+                        }
+                </style><?php
+        }
+
         /**
          * Print JavaScript settings for preview frame.
          *
@@ -503 +518 @@
                         'activePanels' => array(),
                         'activeSections' => array(),
                         'activeControls' => array(),
+                        'l10n' => array(
+                                'loading'  => __( 'Loading ...' ),
+                        ),
                 );
 
                 if ( 2 == $this->nonce_tick ) {

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

@@ -115 +115 @@
                         activeControls: api.settings.activeControls
                 } );
 
+                // Display a loading indicator when preview is reloading, and remove on failure
+                api.preview.bind( 'loading-initiated', function () {
+                        $( 'body' ).addClass( 'wp-customizer-unloading' );
+                        $( 'html' ).prop( 'title', api.settings.l10n.loading );
+                });
+                api.preview.bind( 'loading-failed', function () {
+                        $( 'body' ).removeClass( 'wp-customizer-unloading' );
+                        $( 'html' ).prop( 'title', '' );
+                });
+
                 /* Custom Backgrounds */
                 bg = $.map(['color', 'image', 'position_x', 'repeat', 'attachment'], function( prop ) {
                         return 'background_' + prop;