Ticket #31233: 31233.2.diff

src/wp-admin/css/common.css

@@ -1263 +1263 @@
         -webkit-box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
         box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
         margin: 5px 15px 2px;
+        overflow: hidden;
         padding: 1px 12px;
 }
 
@@ -1276 +1277 @@
 
 .notice-success,
 div.updated {
-     border-color: #7ad03a;
+        border-color: #7ad03a;
 }
 
 .notice-warning {
-    border-color: #ffba00;
+        border-color: #ffba00;
 }
 
 .notice-error,
 div.error {
-    border-color: #dd3d36;
+        border-color: #dd3d36;
 }
 
 .notice-info {
-    border-color: #00a0d2;
+        border-color: #00a0d2;
+}
+
+.notice .dismiss,
+div.updated .dismiss,
+div.error .dismiss {
+        cursor: pointer;
+        float: right;
+        margin: 0.5em 0;
+        padding: 2px;
 }
 
 .wrap .notice,

src/wp-admin/js/common.js

@@ -373 +373 @@
         $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
         $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
 
+        // Hide and make notices dismissible with cookie support.
+        $( 'div.updated, div.error, div.notice' ).each(function(){
+                var $this = $(this),
+                        $anchor = $( '<a href="#" class="dismiss"></a>' ),
+                        hide = commonL10n.hide || '',
+                        dismiss = commonL10n.dismiss || '',
+                        id = 0;
+
+                // Bail, we're not allowed to hide this notice.
+                if ( $this.data( 'hide' ) === false ) {
+                        return;
+                }
+
+                // This notice is dismissible, so use cookies to hide it for a period of time.
+                if ( $this.data( 'dismiss' ) === true ) {
+
+                        // Create the notice ID by converting the text to a 32bit integer.
+                        if ( $this.text().length !== 0 ) {
+                                var i, len, chr;
+                                for ( i = 0, len = $this.text().length; i < len; i++ ) {
+                                        chr = $this.text().charCodeAt(i);
+                                        id = ( ( id << 5 ) - id ) + chr;
+                                        id |= 0;
+                                }
+                        }
+
+                        // Cookie check, remove element & bail if set.
+                        if ( id !== 0 && wpCookies.get( 'wp-dismiss-notice-' + id ) === 'dismissed' ) {
+                                $this.remove();
+                                return;
+                        }
+                }
+
+                // Ensure plain text
+                $anchor.text( id !== 0 ? dismiss : hide );
+
+                $this.prepend( $anchor );
+
+                $anchor.on( 'click.wp-dismiss-notice', function( event ) {
+                        event.preventDefault();
+                        $this.remove();
+
+                        // Set a session cookie, or use the expires data. 
+                        if ( id !== 0 ) {
+                                wpCookies.set( 'wp-dismiss-notice-' + id, 'dismissed', $this.data( 'expires' ) || '' );
+                        }
+                });
+        });
+
         // Init screen meta
         screenMeta.init();
 

src/wp-includes/script-loader.php

@@ -79 +79 @@
 
         $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-                'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
+                'warnDelete' => __( "You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete." ),
+                'hide'       => __( 'Hide' ),
+                'dismiss'    => __( 'Dismiss' )
         ) );
 
         $scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );