<!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>[49807] trunk/src/js/_enqueues: Editor: Fix improper triggering of the "Are you sure" prompt when navigating away from the old, "classic" Edit Post screen and there are no 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 { white-space: pre-line; 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/49807">49807</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/49807","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-12-16 15:23:35 +0000 (Wed, 16 Dec 2020)</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'>Editor: Fix improper triggering of the "Are you sure" prompt when navigating away from the old, "classic" Edit Post screen and there are no changes. Was triggered when there is an instance of TinyMCE in the Excerpt postbox.
Props rodrigosprimo, jonathanstegall, kevin940726, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/52038">#52038</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminpostjs">trunk/src/js/_enqueues/admin/post.js</a></li>
<li><a href="#trunksrcjs_enqueueswpautosavejs">trunk/src/js/_enqueues/wp/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/post.js 2020-12-16 14:24:07 UTC (rev 49806)
+++ trunk/src/js/_enqueues/admin/post.js 2020-12-16 15:23:35 UTC (rev 49807)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,12 +488,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When the user is trying to load another page, or reloads current page
</span><span class="cx" style="display: block; padding: 0 10px"> * show a confirmation dialog when there are unsaved changes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(window).on( 'beforeunload.edit-post', function() {
- var editor = typeof tinymce !== 'undefined' && tinymce.get('content');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( window ).on( 'beforeunload.edit-post', function( event ) {
+ var editor = window.tinymce && window.tinymce.get( 'content' );
+ var changed = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( editor && ! editor.isHidden() && editor.isDirty() ) ||
- ( wp.autosave && wp.autosave.server.postChanged() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp.autosave ) {
+ changed = wp.autosave.server.postChanged();
+ } else if ( editor ) {
+ changed = ( ! editor.isHidden() && editor.isDirty() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( changed ) {
+ event.preventDefault();
+ // The return string is needed for browser compat.
+ // See https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event.
</ins><span class="cx" style="display: block; padding: 0 10px"> return __( 'The changes you made will be lost if you navigate away from this page.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }).on( 'unload.edit-post', function( event ) {
</span></span></pre></div>
<a id="trunksrcjs_enqueueswpautosavejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/autosave.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/autosave.js 2020-12-16 14:24:07 UTC (rev 49806)
+++ trunk/src/js/_enqueues/wp/autosave.js 2020-12-16 15:23:35 UTC (rev 49807)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,10 +36,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function autosave() {
</span><span class="cx" style="display: block; padding: 0 10px"> var initialCompareString,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- lastTriggerSave = 0,
- $document = $(document);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialCompareData = {},
+ lastTriggerSave = 0,
+ $document = $( document );
</ins><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">+ * Sets the initial compare data.
+ *
+ * @since 5.6.1
+ */
+ function setInitialCompare() {
+ initialCompareData = {
+ post_title: $( '#title' ).val() || '',
+ content: $( '#content' ).val() || '',
+ excerpt: $( '#excerpt' ).val() || ''
+ };
+
+ initialCompareString = getCompareString( initialCompareData );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Returns the data saved in both local and remote autosave.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,6 +702,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {boolean} True if the post has been changed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function postChanged() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var changed = false;
+
+ // If there are TinyMCE instances, loop through them.
+ if ( window.tinymce ) {
+ window.tinymce.each( [ 'content', 'excerpt' ], function( field ) {
+ var editor = window.tinymce.get( field );
+
+ if ( ! editor || editor.isHidden() ) {
+ if ( $( '#' + field ).val() !== initialCompareData[ field ] ) {
+ changed = true;
+ // Break.
+ return false;
+ }
+ } else if ( editor.isDirty() ) {
+ changed = true;
+ return false;
+ }
+ } );
+
+ if ( $( '#title' ).val() !== initialCompareData.post_title ) {
+ changed = true;
+ }
+
+ return changed;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return getCompareString() !== initialCompareString;
</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">@@ -832,16 +874,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'tinymce-editor-init.autosave', function( event, editor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( editor.id === 'content' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset the initialCompare data after the TinyMCE instances have been initialized.
+ if ( 'content' === editor.id || 'excerpt' === editor.id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> window.setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.save();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- initialCompareString = getCompareString();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setInitialCompare();
</ins><span class="cx" style="display: block; padding: 0 10px"> }, 1000 );
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set the initial compare string in case TinyMCE is not used or not loaded first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- initialCompareString = getCompareString();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setInitialCompare();
</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"> return {
</span></span></pre>
</div>
</div>
</body>
</html>