<!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>[33821] trunk/src/wp-admin: Comments: dynamically update the document title text of the Comments List Table page when dynamically updating the number of comments awaiting moderation.</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/33821">33821</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/33821","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-31 17:57:32 +0000 (Mon, 31 Aug 2015)</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: dynamically update the document title text of the Comments List Table page when dynamically updating the number of comments awaiting moderation.
Fixes <a href="https://core.trac.wordpress.org/ticket/33414">#33414</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2015-08-31 03:50:05 UTC (rev 33820)
+++ trunk/src/wp-admin/edit-comments.php 2015-08-31 17:57:32 UTC (rev 33821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,10 +104,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script('admin-comments');
</span><span class="cx" style="display: block; padding: 0 10px"> enqueue_comment_hotkeys_js();
</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 ( $post_id )
- $title = sprintf( __( 'Comments on “%s”' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) );
-else
- $title = __('Comments');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $post_id ) {
+ $comments_count = wp_count_comments( $post_id );
+ $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
+ if ( $comments_count->moderated > 0 ) {
+ $title = sprintf(
+ __( 'Comments (%s) on “%s”' ),
+ number_format_i18n( $comments_count->moderated ),
+ $draft_or_post_title
+ );
+ } else {
+ $title = sprintf( __( 'Comments on “%s”' ), $draft_or_post_title );
+ }
+} else {
+ $comments_count = wp_count_comments();
+ if ( $comments_count->moderated > 0 ) {
+ $title = sprintf(
+ __( 'Comments (%s)' ),
+ number_format_i18n( $comments_count->moderated )
+ );
+ } else {
+ $title = __( 'Comments' );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_screen_option( 'per_page' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<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 2015-08-31 03:50:05 UTC (rev 33820)
+++ trunk/src/wp-admin/js/edit-comments.js 2015-08-31 17:57:32 UTC (rev 33821)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,11 +2,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var setCommentsList, theList, theExtraList, commentReply;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var getCount, updateCount, updateCountText, updatePending, updateApproved;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var getCount, updateCount, updateCountText, updatePending, updateApproved,
+ updateHtmlTitle, adminTitle = document.title;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setCommentsList = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- lastConfidentTime = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ lastConfidentTime = 0, titleDiv, titleRegEx,
+ isDashboard = $('#dashboard_right_now').length;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> totalInput = $('input[name="_total"]', '#comments-form');
</span><span class="cx" style="display: block; padding: 0 10px"> perPageInput = $('input[name="_per_page"]', '#comments-form');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,6 +137,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> el.html(n);
</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">+ updateHtmlTitle = function ( diff ) {
+ var newTitle, regExMatch, titleCount;
+
+ titleRegEx = titleRegEx || new RegExp( 'Comments (\\([0-9' + thousandsSeparator + ']+\\))?' );
+ // count funcs operate on a $'d element
+ titleDiv = titleDiv || $( '<div />' );
+ newTitle = adminTitle;
+
+ titleDiv.html( document.title );
+ titleCount = getCount( titleDiv ) + diff;
+ if ( titleCount >= 1 ) {
+ updateCount( titleDiv, titleCount );
+ regExMatch = titleRegEx.exec( document.title );
+ if ( regExMatch ) {
+ newTitle = document.title.replace( regExMatch[0], 'Comments (' + titleDiv.text() + ') ' );
+ }
+ } else {
+ regExMatch = titleRegEx.exec( newTitle );
+ if ( regExMatch ) {
+ newTitle = newTitle.replace( regExMatch[0], 'Comments' );
+ }
+ }
+ document.title = newTitle;
+ };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> updatePending = function( diff, commentPostId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var postSelector = '.post-com-count-' + commentPostId,
</span><span class="cx" style="display: block; padding: 0 10px"> noClass = 'comment-count-no-pending',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,6 +170,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> pending,
</span><span class="cx" style="display: block; padding: 0 10px"> noPending;
</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 ( ! isDashboard ) {
+ updateHtmlTitle( diff );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'span.pending-count' ).each(function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var a = $(this), n = getCount(a) + diff;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( n < 1 )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> updateCountText( 'span.trash-count', trashDiff );
</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">- if ( ! $('#dashboard_right_now').length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isDashboard ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $(settings.target).parent().is('span.undo') )
</span><span class="cx" style="display: block; padding: 0 10px"> total++;
</span></span></pre>
</div>
</div>
</body>
</html>