<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31697] trunk/src: Customizer: Add loading indicators for the Customizer preview.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31697">31697</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31697","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-10 15:55:28 +0000 (Tue, 10 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Add loading indicators for the Customizer preview.
props Fab1en, westonruter.
fixes <a href="https://core.trac.wordpress.org/ticket/31196">#31196</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesjscustomizepreviewjs">trunk/src/wp-includes/js/customize-preview.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2015-03-10 15:31:54 UTC (rev 31696)
+++ trunk/src/wp-admin/css/themes.css 2015-03-10 15:55:28 UTC (rev 31697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1352,6 +1352,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-preview.wp-full-overlay-main {
+ background: url(../images/spinner.gif) no-repeat center center;
+ -webkit-background-size: 20px 20px;
+ background-size: 20px 20px;
+}
+
+#customize-preview.wp-full-overlay-main.iframe-ready {
+ background: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay-sidebar .wp-full-overlay-header {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> left: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1710,6 +1720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-size: 15px 123px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #customize-preview.wp-full-overlay-main,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-loading #customize-container,
</span><span class="cx" style="display: block; padding: 0 10px"> .theme-install-overlay .wp-full-overlay-main {
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: url(../images/spinner-2x.gif);
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2015-03-10 15:31:54 UTC (rev 31696)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-03-10 15:55:28 UTC (rev 31697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1914,6 +1914,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.bind( 'ready', this._ready );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.bind( 'ready', function ( data ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.container.addClass( 'iframe-ready' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2217,6 +2220,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> refresh: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display loading indicator
+ this.send( 'loading-initiated' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.abort();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.loading = new api.PreviewFrame({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2249,8 +2255,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.loading.fail( function( reason, location ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'redirect' === reason && location )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.send( 'loading-failed' );
+ if ( 'redirect' === reason && location ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self.previewUrl( location );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'logged out' === reason ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.preview ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2261,8 +2269,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self.login().done( self.refresh );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'cheatin' === reason )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cheatin' === reason ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self.cheatin();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2015-03-10 15:31:54 UTC (rev 31696)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2015-03-10 15:55:28 UTC (rev 31697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,6 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp', array( $this, 'customize_preview_override_404_status' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', array( $this, 'customize_preview_html5' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_die_handler', array( $this, 'remove_preview_signature' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Print a workaround to handle HTML5 tags in IE < 9
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print a workaround to handle HTML5 tags in IE < 9.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,6 +562,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print CSS for loading indicators for the Customizer preview.
+ *
+ * @since 4.2.0
+ */
+ 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
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Print JavaScript settings for preview frame.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,6 +592,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activePanels' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'activeSections' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'activeControls' => array(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'l10n' => array(
+ 'loading' => __( 'Loading ...' ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 2 == $this->nonce_tick ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizepreviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/customize-preview.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-preview.js 2015-03-10 15:31:54 UTC (rev 31696)
+++ trunk/src/wp-includes/js/customize-preview.js 2015-03-10 15:55:28 UTC (rev 31697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,6 +115,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> activeControls: api.settings.activeControls
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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', '' );
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Custom Backgrounds */
</span><span class="cx" style="display: block; padding: 0 10px"> bg = $.map(['color', 'image', 'position_x', 'repeat', 'attachment'], function( prop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'background_' + prop;
</span></span></pre>
</div>
</div>
</body>
</html>