Changeset 58258

Timestamp:

05/30/2024 05:24:44 PM (7 months ago)

Author:

hellofromTonya

Message:

Plugins: Revert r58083 show an admin notice on successful activation.

With a new direction in the 6.5.4 to restore the Activate button's href (see #61319 / [58250]), the changesets committed for 6.5.3 (see #60992) are now dead code and will not render the admin notice on successful plugin activation.

This commit is a clean revert of r58083.

Follow-up to [58250], [58257].

Reviewed by jorbin.
Reverts [58083] on the 6.5 branch.

Props swissspidy, azaozz, costdev, jorbin, hellofromTonya, afragen.
Fixes #61331.
See #60992.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/js/_enqueues/wp/updates.js (modified) (7 diffs)
• src/wp-admin/css/common.css (modified) (1 diff)

branches/6.5/src/js/_enqueues/wp/updates.js

@@ -1106 +1106 @@
      * @since 6.5.0
      *
-     * @param {Object} response            Response from the server.
-     * @param {string} response.slug       Slug of the activated plugin.
-     * @param {string} response.pluginName Name of the activated plugin.
-     * @param {string} response.plugin     The plugin file, relative to the plugins directory.
+     * @param {Object} response             Response from the server.
+     * @param {string} response.slug        Slug of the activated plugin.
+     * @param {string} response.pluginName  Name of the activated plugin.
+     * @param {string} response.plugin      The plugin file, relative to the plugins directory.
      */
     wp.updates.activatePluginSuccess = function( response ) {
         var $message = $( '.plugin-card-' + response.slug + ', #plugin-information-footer' ).find( '.activating-message' ),
-            isInModal = 'plugin-information-footer' === $message.parent().attr( 'id' ),
             buttonText = _x( 'Activated!', 'plugin' ),
             ariaLabel = sprintf(
@@ -1119 +1118 @@
                 '%s activated successfully.',
                 response.pluginName
-            ),
-            noticeData = {
-                id: 'plugin-activated-successfully',
-                className: 'notice-success',
-                message: sprintf(
-                    /* translators: %s: The refresh link's attributes. */
-                    __( 'Plugin activated. Some changes may not occur until you refresh the page. <a %s>Refresh Now</a>' ),
-                    'href="#" class="button button-secondary refresh-page"'
-                ),
-                slug: response.slug
-            },
-            noticeTarget;
-
-        wp.a11y.speak( __( 'Activation completed successfully. Some changes may not occur until you refresh the page.' ) );
+            );
+
+        wp.a11y.speak( __( 'Activation completed successfully.' ) );
         $document.trigger( 'wp-plugin-activate-success', response );
 
@@ -1141 +1129 @@
             .text( buttonText );
 
-        if ( isInModal ) {
+        if ( 'plugin-information-footer' === $message.parent().attr( 'id' ) ) {
             wp.updates.setCardButtonStatus(
                 {
@@ -1152 +1140 @@
                 }
             );
-
-            // Add a notice to the modal's footer.
-            $message.replaceWith( wp.updates.adminNotice( noticeData ) );
-
-            // Send notice information back to the parent screen.
-            noticeTarget = window.parent === window ? null : window.parent;
-            $.support.postMessage = !! window.postMessage;
-            if ( false !== $.support.postMessage && null !== noticeTarget && -1 === window.parent.location.pathname.indexOf( 'index.php' ) ) {
-                noticeTarget.postMessage(
-                    JSON.stringify( noticeData ),
-                    window.location.origin
-                );
-            }
-        } else {
-            // Add a notice to the top of the screen.
-            wp.updates.addAdminNotice( noticeData );
         }
 
         setTimeout( function() {
-            if ( isInModal ) {
+            $message.removeClass( 'activated-message' )
+            .text( _x( 'Active', 'plugin' ) );
+
+            if ( 'plugin-information-footer' === $message.parent().attr( 'id' ) ) {
                 wp.updates.setCardButtonStatus(
                     {
@@ -1185 +1160 @@
                     }
                 );
-            } else {
-                $message.removeClass( 'activated-message' ).text( _x( 'Active', 'plugin' ) );
             }
         }, 1000 );
@@ -3229 +3202 @@
             }
 
-            if ( 'undefined' !== typeof message.id && 'plugin-activated-successfully' === message.id ) {
-                wp.updates.addAdminNotice( message );
-                return;
-            }
-
             if (
                 'undefined' !== typeof message.status &&
@@ -3466 +3434 @@
             }
         );
-
-        /**
-         * Click handler for page refresh link.
-         *
-         * @since 6.5.3
-         *
-         * @param {Event} event Event interface.
-         */
-        $document.on( 'click', '.refresh-page', function( event ) {
-            event.preventDefault();
-
-            if ( window.parent === window ) {
-                window.location.reload();
-            } else {
-                window.parent.location.reload();
-            }
-        } );
     } );
 })( jQuery, window.wp, window._wpUpdatesSettings );

branches/6.5/src/wp-admin/css/common.css

@@ -1514 +1514 @@
 }
 
-#plugin-information-footer #plugin-activated-successfully {
-    margin-bottom: 0;
-}
-
-#plugin-information-footer #plugin-activated-successfully p {
-    display: flex;
-    gap: 1em;
-    align-items: center;
-    justify-content: space-between;
-    margin: 0;
-}
-
-#plugin-information-footer #plugin-activated-successfully .refresh-page {
-    flex-grow: 0;
-    line-height: 2.15384615;
-    min-height: 0;
-    margin-bottom: 0;
-}
-
 .update-message p:before,
 .updating-message p:before,