<!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>[41788] trunk: Customize: Fix confusion related to visibility of Themes panel with drafted/scheduled changesets.</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/41788">41788</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/41788","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-07 05:59:45 +0000 (Sat, 07 Oct 2017)</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'>Customize: Fix confusion related to visibility of Themes panel with drafted/scheduled changesets.
* Prevent autoloading an existing draft/future changeset when theme not active.
* Add missing notifications container to Themes panel.
* Remove deactivation of themes panel when selected status is not publish.
* Show notification in Themes panel when themes cannot be previewed and disable preview buttons.
* Reject installTheme call when theme preview not available.
* Return promise from installTheme and eliminate use of global events in favor of promises.
Props westonruter, melchoyce, zoonini.
See <a href="https://core.trac.wordpress.org/ticket/37661">#37661</a>, <a href="https://core.trac.wordpress.org/ticket/39896">#39896</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42126">#42126</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunksrcwpincludescustomizeclasswpcustomizethemespanelphp">trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2017-10-07 00:39:41 UTC (rev 41787)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-07 05:59:45 UTC (rev 41788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2801,11 +2801,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> attachEvents: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var panel = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var panel = this, toggleDisabledNotification;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attach regular panel events.
</span><span class="cx" style="display: block; padding: 0 10px"> api.Panel.prototype.attachEvents.apply( panel );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toggleDisabledNotification = function() {
+ if ( 'publish' === api.state( 'selectedChangesetStatus' ).get() ) {
+ panel.notifications.remove( 'theme_switch_unavailable' );
+ } else {
+ panel.notifications.add( new api.Notification( 'theme_switch_unavailable', {
+ message: api.l10n.themePreviewUnavailable,
+ type: 'warning'
+ } ) );
+ }
+ };
+ toggleDisabledNotification();
+ api.state( 'selectedChangesetStatus' ).bind( toggleDisabledNotification );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Collapse panel to customize the current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> panel.contentContainer.on( 'click', '.customize-theme', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> panel.collapse();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2887,18 +2900,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @returns {void}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {jQuery.Event} event - Event.
+ * @returns {jQuery.promise} Promise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> installTheme: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var panel = this, preview = false, slug = $( event.target ).data( 'slug' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var panel = this, preview, onInstallSuccess, slug = $( event.target ).data( 'slug' ), deferred = $.Deferred(), request;
+ preview = $( event.target ).hasClass( 'preview' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
+ if ( 'publish' !== api.state( 'selectedChangesetStatus' ).get() && slug !== api.settings.theme.stylesheet ) {
+ deferred.reject({
+ errorCode: 'theme_switch_unavailable'
+ });
+ return deferred.promise();
+ }
+
+ // Theme is already being installed.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( _.contains( panel.installingThemes, slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return; // Theme is already being installed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deferred.reject({
+ errorCode: 'theme_already_installing'
+ });
+ return deferred.promise();
</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"> wp.updates.maybeRequestFilesystemCredentials( event );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( document ).one( 'wp-theme-install-success', function( event, response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ onInstallSuccess = function( response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var theme = false, themeControl;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preview ) {
</span><span class="cx" style="display: block; padding: 0 10px"> api.notifications.remove( 'theme_installing' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2915,6 +2942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't add the same theme more than once.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! theme || api.control.has( 'installed_theme_' + theme.id ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deferred.resolve( response );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2939,23 +2967,29 @@
</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">- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deferred.resolve( response );
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- panel.installingThemes.push( $( event.target ).data( 'slug' ) ); // Note: we don't remove elements from installingThemes, since they shouldn't be installed again.
- wp.updates.installTheme( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ panel.installingThemes.push( slug ); // Note: we don't remove elements from installingThemes, since they shouldn't be installed again.
+ request = wp.updates.installTheme( {
</ins><span class="cx" style="display: block; padding: 0 10px"> slug: slug
</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"> // Also preview the theme as the event is triggered on Install & Preview.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $( event.target ).hasClass( 'preview' ) ) {
- preview = true;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preview ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> api.notifications.add( new api.OverlayNotification( 'theme_installing', {
</span><span class="cx" style="display: block; padding: 0 10px"> message: api.l10n.themeDownloading,
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'info',
</span><span class="cx" style="display: block; padding: 0 10px"> loading: true
</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">+
+ request.done( onInstallSuccess );
+ request.fail( function() {
+ api.notifications.remove( 'theme_installing' );
+ } );
+
+ return deferred.promise();
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2969,6 +3003,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> loadThemePreview: function( themeId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var deferred = $.Deferred(), onceProcessingComplete, urlParser, queryParams;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
+ if ( 'publish' !== api.state( 'selectedChangesetStatus' ).get() && themeId !== api.settings.theme.stylesheet ) {
+ return deferred.reject().promise();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> urlParser = document.createElement( 'a' );
</span><span class="cx" style="display: block; padding: 0 10px"> urlParser.href = location.href;
</span><span class="cx" style="display: block; padding: 0 10px"> queryParams = _.extend(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4741,14 +4780,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var control = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var control = this, disableSwitchButtons, updateButtons;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ disableSwitchButtons = function() {
+ return 'publish' !== api.state( 'selectedChangesetStatus' ).get() && control.params.theme.id !== api.settings.theme.stylesheet;
+ };
+ updateButtons = function() {
+ control.container.find( 'button' ).toggleClass( 'disabled', disableSwitchButtons() );
+ };
+
+ api.state( 'selectedChangesetStatus' ).bind( updateButtons );
+ updateButtons();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> control.container.on( 'touchmove', '.theme', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> control.touchDrag = true;
</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"> // Bind details view trigger.
</span><span class="cx" style="display: block; padding: 0 10px"> control.container.on( 'click keydown touchend', '.theme', function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var section;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
</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">@@ -4764,7 +4814,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"> event.preventDefault(); // Keep this AFTER the key filter above
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.section( control.section() ).showDetails( control.params.theme );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ section = api.section( control.section() );
+ section.showDetails( control.params.theme, function() {
+ section.overlay.find( '.theme-actions button' ).toggleClass( 'disabled', disableSwitchButtons() );
+ } );
</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"> control.container.on( 'render-screenshot', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7339,24 +7392,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> history.replaceState( {}, document.title, urlParser.href );
</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">- // Deactivate themes panel if changeset status is not auto-draft.
- api.panel( 'themes', function( themesPanel ) {
- var isPanelActive, updatePanelActive;
-
- isPanelActive = function() {
- return 'publish' === selectedChangesetStatus.get() && ( ! changesetStatus() || 'auto-draft' === changesetStatus() );
- };
- themesPanel.active.validate = isPanelActive;
-
- updatePanelActive = function() {
- themesPanel.active.set( isPanelActive() );
- };
-
- updatePanelActive();
- changesetStatus.bind( updatePanelActive );
- selectedChangesetStatus.bind( updatePanelActive );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Show changeset UUID in URL when in branching mode and there is a saved changeset.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( api.settings.changeset.branching ) {
</span><span class="cx" style="display: block; padding: 0 10px"> changesetStatus.bind( function( newStatus ) {
</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 2017-10-07 00:39:41 UTC (rev 41787)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2017-10-07 05:59:45 UTC (rev 41788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +607,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->_changeset_uuid ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $changeset_uuid = null;
</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 ( ! $this->branching() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->branching() && $this->is_theme_active() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $unpublished_changeset_posts = $this->get_changeset_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => array_diff( get_post_stati(), array( 'auto-draft', 'publish', 'trash', 'inherit', 'private' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude_restore_dismissed' => false,
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizethemespanelphp"></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/customize/class-wp-customize-themes-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2017-10-07 00:39:41 UTC (rev 41787)
+++ trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2017-10-07 05:59:45 UTC (rev 41788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,6 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <div class="customize-control-notifications-container"></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="customize-themes-full-container-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="customize-themes-full-container">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2017-10-07 00:39:41 UTC (rev 41787)
+++ trunk/src/wp-includes/script-loader.php 2017-10-07 05:59:45 UTC (rev 41788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashConfirm' => __( 'Are you sure you’d like to discard your unpublished changes?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to the Customizer to load the autosaved version */
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosaveNotice' => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'videoHeaderNotice' => __( 'This theme doesn\'t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'videoHeaderNotice' => __( 'This theme doesn’t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // Used for overriding the file types allowed in plupload.
</span><span class="cx" style="display: block; padding: 0 10px"> 'allowedFiles' => __( 'Allowed Files' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'customCssError' => wp_array_slice_assoc(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,6 +595,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'singular', 'plural' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'themePreviewUnavailable' => __( 'Sorry, you can’t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2017-10-07 00:39:41 UTC (rev 41787)
+++ trunk/tests/phpunit/tests/customize/manager.php 2017-10-07 05:59:45 UTC (rev 41788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,6 +197,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $wp_customize->changeset_uuid(), array( $uuid1, $uuid2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wp_customize->changeset_post_id() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Make sure existing changeset is not autoloaded in the case of previewing a theme switch.
+ switch_theme( 'twentyseventeen' );
+ $wp_customize = new WP_Customize_Manager( array(
+ 'changeset_uuid' => false, // Cause UUID to be deferred.
+ 'branching' => false,
+ 'theme' => 'twentyfifteen',
+ ) );
+ $this->assertEmpty( $wp_customize->changeset_post_id() );
</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>
</div>
</body>
</html>