Changeset 53123

Timestamp:

04/11/2022 04:35:37 AM (4 years ago)

Author:

peterwilsoncc

Message:

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 [52170], [52672].

Props SergeyBiryukov, ryokuhi, johnregan3, sabernhardt, joedolson.
Fixes #55078.
See #54955.

Location:

trunk/src

Files:

• js/_enqueues/lib/ajax-response.js (modified) (3 diffs)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)

trunk/src/js/_enqueues/lib/ajax-response.js

@@ -19 +19 @@
         },
         parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission.
-                var parsed = {}, re = jQuery('#' + r).empty(), err = '', successmsg = '';
+                var parsed = {}, re = jQuery('#' + r).empty(), err = '', noticeMessage = '';
 
                 if ( x && typeof x === 'object' && x.getElementsByTagName('wp_ajax') ) {
@@ -28 +28 @@
                                 response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
                                 response.data = jQuery( 'response_data', child ).text();
-                                if ( jQuery( 'body' ).hasClass( 'edit-tags-php' ) ) {
-                                        successmsg += response.data;
-                                }
                                 response.supplemental = {};
                                 if ( !jQuery( 'supplemental', child ).children().each( function() {
+
+                                        if ( this.nodeName === 'notice' ) {
+                                                noticeMessage += jQuery(this).text();
+                                                return;
+                                        }
+
                                         response.supplemental[this.nodeName] = jQuery(this).text();
                                 } ).length ) { response.supplemental = false; }
@@ -53 +56 @@
                                 re.html( '<div class="error">' + err + '</div>' );
                                 wp.a11y.speak( err );
-                        } else if ( successmsg.length ) {
-                                re.html( '<div class="updated notice is-dismissible"><p>' + successmsg + '</p></div>');
+                        } else if ( noticeMessage.length ) {
+                                re.html( '<div class="updated notice is-dismissible"><p>' + noticeMessage + '</p></div>');
                                 jQuery(document).trigger( 'wp-updates-notice-added' );
-                                wp.a11y.speak( successmsg );
+                                wp.a11y.speak( noticeMessage );
                         }
                         return parsed;

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1122 +1122 @@
                         'what'         => 'taxonomy',
                         'data'         => $message,
-                        'supplemental' => compact( 'parents', 'noparents' ),
+                        'supplemental' => array(
+                                'parents'   => $parents,
+                                'noparents' => $noparents,
+                                'notice'    => $message,
+                        ),
                 )
         );