<!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>[41947] trunk/src/wp-admin/js: Customize: Prevent drawing attention to save button if status unchanged from publish; account for changes to status/date when alerting about unsaved changes.</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/41947">41947</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/41947","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-19 17:41:05 +0000 (Thu, 19 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: Prevent drawing attention to save button if status unchanged from publish; account for changes to status/date when alerting about unsaved changes.
Also fix malformed ESLint directive from <a href="https://core.trac.wordpress.org/changeset/41933">[41933]</a>.
Amends <a href="https://core.trac.wordpress.org/changeset/41932">[41932]</a>.
See <a href="https://core.trac.wordpress.org/ticket/39896">#39896</a>, <a href="https://core.trac.wordpress.org/ticket/42211">#42211</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjswidgetsmediawidgetsjs">trunk/src/wp-admin/js/widgets/media-widgets.js</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-19 15:35:47 UTC (rev 41946)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-19 17:41:05 UTC (rev 41947)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6986,12 +6986,21 @@
</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"> section.expanded.bind( function( isExpanded ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var defaultChangesetStatus;
</ins><span class="cx" style="display: block; padding: 0 10px"> publishSettingsBtn.attr( 'aria-expanded', String( isExpanded ) );
</span><span class="cx" style="display: block; padding: 0 10px"> publishSettingsBtn.toggleClass( 'active', isExpanded );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isExpanded ) {
</span><span class="cx" style="display: block; padding: 0 10px"> cancelHighlightScheduleButton();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( api.state( 'selectedChangesetStatus' ).get() !== api.state( 'changesetStatus' ).get() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return;
+ }
+
+ defaultChangesetStatus = api.state( 'changesetStatus' ).get();
+ if ( '' === defaultChangesetStatus || 'auto-draft' === defaultChangesetStatus ) {
+ defaultChangesetStatus = 'publish';
+ }
+
+ if ( api.state( 'selectedChangesetStatus' ).get() !== defaultChangesetStatus ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> highlightScheduleButton();
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'future' === api.state( 'selectedChangesetStatus' ).get() && api.state( 'selectedChangesetDate' ).get() !== api.state( 'changesetDate' ).get() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> highlightScheduleButton();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8479,6 +8488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var isInsideIframe = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function isCleanState() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var defaultChangesetStatus;
</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"> * Handle special case of previewing theme switch since some settings (for nav menus and widgets)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8488,6 +8498,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 0 === api._latestRevision;
</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">+ // Dirty if the changeset status has been changed but not saved yet.
+ defaultChangesetStatus = api.state( 'changesetStatus' ).get();
+ if ( '' === defaultChangesetStatus || 'auto-draft' === defaultChangesetStatus ) {
+ defaultChangesetStatus = 'publish';
+ }
+ if ( api.state( 'selectedChangesetStatus' ).get() !== defaultChangesetStatus ) {
+ return false;
+ }
+
+ // Dirty if scheduled but the changeset date hasn't been saved yet.
+ if ( 'future' === api.state( 'selectedChangesetStatus' ).get() && api.state( 'selectedChangesetDate' ).get() !== api.state( 'changesetDate' ).get() ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return api.state( 'saved' ).get() && 'auto-draft' !== api.state( 'changesetStatus' ).get();
</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">@@ -8501,6 +8525,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function startPromptingBeforeUnload() {
</span><span class="cx" style="display: block; padding: 0 10px"> api.unbind( 'change', startPromptingBeforeUnload );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.state( 'selectedChangesetStatus' ).unbind( startPromptingBeforeUnload );
+ api.state( 'selectedChangesetDate' ).unbind( startPromptingBeforeUnload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prompt user with AYS dialog if leaving the Customizer with unsaved changes
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).on( 'beforeunload.customize-confirm', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8513,6 +8539,8 @@
</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"> api.bind( 'change', startPromptingBeforeUnload );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.state( 'selectedChangesetStatus' ).bind( startPromptingBeforeUnload );
+ api.state( 'selectedChangesetDate' ).bind( startPromptingBeforeUnload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function requestClose() {
</span><span class="cx" style="display: block; padding: 0 10px"> var clearedToClose = $.Deferred(), dismissAutoSave = false, dismissLock = false;
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsmediawidgetsjs"></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/widgets/media-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/media-widgets.js 2017-10-19 15:35:47 UTC (rev 41946)
+++ trunk/src/wp-admin/js/widgets/media-widgets.js 2017-10-19 17:41:05 UTC (rev 41947)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</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"> initialize: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var view = this, embedController; // eslint-disable-line consistent-thi
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var view = this, embedController; // eslint-disable-line consistent-this
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.media.view.Embed.prototype.initialize.call( view, options );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'image' !== view.controller.options.mimeType ) {
</span><span class="cx" style="display: block; padding: 0 10px"> embedController = view.controller.states.get( 'embed' );
</span></span></pre>
</div>
</div>
</body>
</html>