<!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>[47506] trunk/src: Comments: Fix title not updating when replying to a comment</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/47506">47506</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/47506","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>noisysocks</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-25 04:53:06 +0000 (Wed, 25 Mar 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'>Comments: Fix title not updating when replying to a comment
When replying to an existing comment, the comment form is moved to below the
existing comment with JS, but the form heading was not being updated. This
fixes the issue by introducing a new data-attribute to the reply link with the
correct heading string, and applying that string to the heading when the form
is moved.
Props isabel_brison, azaozz, peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/38009">#38009</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibcommentreplyjs">trunk/src/js/_enqueues/lib/comment-reply.js</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibcommentreplyjs"></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/lib/comment-reply.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/comment-reply.js 2020-03-24 21:56:27 UTC (rev 47505)
+++ trunk/src/js/_enqueues/lib/comment-reply.js 2020-03-25 04:53:06 UTC (rev 47506)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,12 +14,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Settings.
</span><span class="cx" style="display: block; padding: 0 10px"> var config = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- commentReplyClass : 'comment-reply-link',
- cancelReplyId : 'cancel-comment-reply-link',
- commentFormId : 'commentform',
- temporaryFormId : 'wp-temp-form-div',
- parentIdFieldId : 'comment_parent',
- postIdFieldId : 'comment_post_ID'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ commentReplyClass : 'comment-reply-link',
+ commentReplyTitleId : 'reply-title',
+ cancelReplyId : 'cancel-comment-reply-link',
+ commentFormId : 'commentform',
+ temporaryFormId : 'wp-temp-form-div',
+ parentIdFieldId : 'comment_parent',
+ postIdFieldId : 'comment_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"> // Cross browser MutationObserver.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,8 +172,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> getElementById( config.parentIdFieldId ).value = '0';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Move the respond form back in place of the temporary element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- temporaryElement.parentNode.replaceChild( respondElement ,temporaryElement );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var headingText = temporaryElement.textContent;
+ temporaryElement.parentNode.replaceChild( respondElement, temporaryElement );
</ins><span class="cx" style="display: block; padding: 0 10px"> cancelLink.style.display = 'none';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var replyHeadingElement = getElementById( config.commentReplyTitleId );
+ var replyHeadingTextNode = replyHeadingElement && replyHeadingElement.firstChild;
+ if ( replyHeadingTextNode && replyHeadingTextNode.nodeType === Node.TEXT_NODE && headingText ) {
+ replyHeadingTextNode.textContent = headingText;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</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">@@ -184,11 +191,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {Event} event The calling event.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function clickEvent( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var replyNode = getElementById( config.commentReplyTitleId );
+ var defaultReplyHeading = replyNode && replyNode.firstChild.textContent;
</ins><span class="cx" style="display: block; padding: 0 10px"> var replyLink = this,
</span><span class="cx" style="display: block; padding: 0 10px"> commId = getDataAttribute( replyLink, 'belowelement'),
</span><span class="cx" style="display: block; padding: 0 10px"> parentId = getDataAttribute( replyLink, 'commentid' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- respondId = getDataAttribute( replyLink, 'respondelement'),
- postId = getDataAttribute( replyLink, 'postid'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ respondId = getDataAttribute( replyLink, 'respondelement' ),
+ postId = getDataAttribute( replyLink, 'postid' ),
+ replyTo = getDataAttribute( replyLink, 'replyto' ) || defaultReplyHeading,
</ins><span class="cx" style="display: block; padding: 0 10px"> follow;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! commId || ! parentId || ! respondId || ! postId ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Third party comments systems can hook into this function via the global scope,
</span><span class="cx" style="display: block; padding: 0 10px"> * therefore the click event needs to reference the global scope.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- follow = window.addComment.moveForm(commId, parentId, respondId, postId);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ follow = window.addComment.moveForm( commId, parentId, respondId, postId, replyTo );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === follow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,8 +302,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {String} commentId Database ID of comment being replied to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {String} respondId HTML ID of 'respond' element.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {String} postId Database ID of the post.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {String} replyTo Form heading content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function moveForm( addBelowId, commentId, respondId, postId ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function moveForm( addBelowId, commentId, respondId, postId, replyTo ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get elements based on their IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> var addBelowElement = getElementById( addBelowId );
</span><span class="cx" style="display: block; padding: 0 10px"> respondElement = getElementById( respondId );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,11 +314,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var postIdField = getElementById( config.postIdFieldId );
</span><span class="cx" style="display: block; padding: 0 10px"> var element, cssHidden, style;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var replyHeading = getElementById( config.commentReplyTitleId );
+ var replyHeadingTextNode = replyHeading && replyHeading.firstChild;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! addBelowElement || ! respondElement || ! parentIdField ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Missing key elements, fail.
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'undefined' === typeof replyTo ) {
+ replyTo = replyHeadingTextNode && replyHeadingTextNode.textContent;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> addPlaceHolder( respondElement );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the value of the post.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +337,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> cancelElement.style.display = '';
</span><span class="cx" style="display: block; padding: 0 10px"> addBelowElement.parentNode.insertBefore( respondElement, addBelowElement.nextSibling );
</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">+ if ( replyHeadingTextNode.nodeType === Node.TEXT_NODE ) {
+ replyHeadingTextNode.textContent = replyTo;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This is for backward compatibility with third party commenting systems
</span><span class="cx" style="display: block; padding: 0 10px"> * hooking into the event using older techniques.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,6 +407,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function addPlaceHolder( respondElement ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var temporaryFormId = config.temporaryFormId;
</span><span class="cx" style="display: block; padding: 0 10px"> var temporaryElement = getElementById( temporaryFormId );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var replyElement = getElementById( config.commentReplyTitleId );
+ var initialHeadingText = ( 'undefined' !== typeof replyElement ) ? replyElement.firstChild.textContent : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( temporaryElement ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The element already exists, no need to recreate.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,6 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> temporaryElement = document.createElement( 'div' );
</span><span class="cx" style="display: block; padding: 0 10px"> temporaryElement.id = temporaryFormId;
</span><span class="cx" style="display: block; padding: 0 10px"> temporaryElement.style.display = 'none';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ temporaryElement.textContent = initialHeadingText;
</ins><span class="cx" style="display: block; padding: 0 10px"> respondElement.parentNode.insertBefore( temporaryElement, respondElement );
</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="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2020-03-24 21:56:27 UTC (rev 47505)
+++ trunk/src/wp-includes/comment-template.php 2020-03-25 04:53:06 UTC (rev 47506)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1703,6 +1703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'postid' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'belowelement' => $args['add_below'] . '-' . $comment->comment_ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'respondelement' => $args['respond_id'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'replyto' => sprintf( $args['reply_to_text'], $comment->comment_author ),
</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"> $data_attribute_string = '';
</span></span></pre>
</div>
</div>
</body>
</html>