<!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>[37303] trunk/src: Comments: Keep comments safe in the Edit Post screen.</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/37303">37303</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/37303","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>rachelbaker</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-22 21:42:38 +0000 (Fri, 22 Apr 2016)</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'>Comments: Keep comments safe in the Edit Post screen.
Warns users that have added a new Comment or began editing an existing without saving their changes, before they press the ?\226?\128?\156update?\226?\128?\157 button which would wipe out their comment changes.
Fixes <a href="https://core.trac.wordpress.org/ticket/32818">#32818</a>.
Props polevaultweb.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditcommentsjs"></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/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/edit-comments.js 2016-04-22 21:29:19 UTC (rev 37302)
+++ trunk/src/wp-admin/js/edit-comments.js 2016-04-22 21:42:38 UTC (rev 37303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,6 +566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> commentReply = {
</span><span class="cx" style="display: block; padding: 0 10px"> cid : '',
</span><span class="cx" style="display: block; padding: 0 10px"> act : '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ originalContent : '',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> init : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var row = $('#replyrow');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,6 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.spinner', replyrow ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.cid = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.originalContent = '';
</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"> open : function(comment_id, post_id, action) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,6 +660,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> h = c.height(),
</span><span class="cx" style="display: block; padding: 0 10px"> colspanVal = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.discardCommentChanges() ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> t.close();
</span><span class="cx" style="display: block; padding: 0 10px"> t.cid = comment_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,6 +672,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> action = action || 'replyto';
</span><span class="cx" style="display: block; padding: 0 10px"> act = 'edit' == action ? 'edit' : 'replyto';
</span><span class="cx" style="display: block; padding: 0 10px"> act = t.act = act + '-comment';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.originalContent = $('textarea.comment', rowData).val();
</ins><span class="cx" style="display: block; padding: 0 10px"> colspanVal = $( '> th:visible, > td:visible', c ).length;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure it's actually a table and there's a `colspan` value to apply.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,6 +860,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('table.comments-box').css('display', '');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#no-comments').remove();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ /**
+ * Alert the user if they have unsaved changes on a comment that will be
+ * lost if they proceed.
+ *
+ * @returns {boolean}
+ */
+ discardCommentChanges: function() {
+ var editRow = $( '#replyrow' );
+
+ if ( this.originalContent === $( '#replycontent', editRow ).val() ) {
+ return true;
+ }
+
+ return window.confirm( adminCommentsL10n.warnCommentChanges );
</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="trunksrcwpadminjspostjs"></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/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/post.js 2016-04-22 21:29:19 UTC (rev 37302)
+++ trunk/src/wp-admin/js/post.js 2016-04-22 21:42:38 UTC (rev 37303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,6 +272,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof commentReply !== 'undefined' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Warn the user they have an unsaved comment before submitting
+ * the post data for update.
+ */
+ if ( ! commentReply.discardCommentChanges() ) {
+ return false;
+ }
+
+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Close the comment edit/reply form if open to stop the form
</span><span class="cx" style="display: block; padding: 0 10px"> * action from interfering with the post's form action.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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 2016-04-22 21:29:19 UTC (rev 37302)
+++ trunk/src/wp-includes/script-loader.php 2016-04-22 21:42:38 UTC (rev 37303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,6 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'replyApprove' => __( 'Approve and Reply' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'reply' => __( 'Reply' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'docTitleComments' => __( 'Comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: comments count */
</span><span class="cx" style="display: block; padding: 0 10px"> 'docTitleCommentsCount' => __( 'Comments (%s)' ),
</span></span></pre>
</div>
</div>
</body>
</html>