<!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>[53123] trunk/src: Administration: Remove term page check from `ajax-response.js`.</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/53123">53123</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/53123","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-11 04:35:37 +0000 (Mon, 11 Apr 2022)</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'>Administration: Remove term page check from `ajax-response.js`.
Replace hard coded check for the term creation page in `_enqueues/lib/ajax-response.js` with a check for a notification to display in the AJAX response data.
Follow up to <a href="https://core.trac.wordpress.org/changeset/52170">[52170]</a>, <a href="https://core.trac.wordpress.org/changeset/52672">[52672]</a>.
Props SergeyBiryukov, ryokuhi, johnregan3, sabernhardt, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/55078">#55078</a>.
See <a href="https://core.trac.wordpress.org/ticket/54955">#54955</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibajaxresponsejs">trunk/src/js/_enqueues/lib/ajax-response.js</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibajaxresponsejs"></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/ajax-response.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/ajax-response.js 2022-04-11 04:27:11 UTC (rev 53122)
+++ trunk/src/js/_enqueues/lib/ajax-response.js 2022-04-11 04:35:37 UTC (rev 53123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return r;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var parsed = {}, re = jQuery('#' + r).empty(), err = '', successmsg = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var parsed = {}, re = jQuery('#' + r).empty(), err = '', noticeMessage = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( x && typeof x === 'object' && x.getElementsByTagName('wp_ajax') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parsed.responses = [];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,11 +27,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var th = jQuery(this), child = jQuery(this.firstChild), response;
</span><span class="cx" style="display: block; padding: 0 10px"> response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
</span><span class="cx" style="display: block; padding: 0 10px"> response.data = jQuery( 'response_data', child ).text();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( jQuery( 'body' ).hasClass( 'edit-tags-php' ) ) {
- successmsg += response.data;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> response.supplemental = {};
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !jQuery( 'supplemental', child ).children().each( function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( this.nodeName === 'notice' ) {
+ noticeMessage += jQuery(this).text();
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> response.supplemental[this.nodeName] = jQuery(this).text();
</span><span class="cx" style="display: block; padding: 0 10px"> } ).length ) { response.supplemental = false; }
</span><span class="cx" style="display: block; padding: 0 10px"> response.errors = [];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( err.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> re.html( '<div class="error">' + err + '</div>' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( err );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( successmsg.length ) {
- re.html( '<div class="updated notice is-dismissible"><p>' + successmsg + '</p></div>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( noticeMessage.length ) {
+ re.html( '<div class="updated notice is-dismissible"><p>' + noticeMessage + '</p></div>');
</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).trigger( 'wp-updates-notice-added' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.a11y.speak( successmsg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.a11y.speak( noticeMessage );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return parsed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2022-04-11 04:27:11 UTC (rev 53122)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2022-04-11 04:35:37 UTC (rev 53123)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1121,7 +1121,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $message,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'supplemental' => compact( 'parents', 'noparents' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'supplemental' => array(
+ 'parents' => $parents,
+ 'noparents' => $noparents,
+ 'notice' => $message,
+ ),
</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>
</div>
</body>
</html>