<!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>[35681] trunk/src: Plugins: add dismissible notices to update failures.</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/35681">35681</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/35681","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-11-18 20:09:21 +0000 (Wed, 18 Nov 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'>Plugins: add dismissible notices to update failures.
Adds unit test.
Props afercia, mehulkaklotar.
Fixes <a href="https://core.trac.wordpress.org/ticket/33465">#33465</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpadminjsupdatesjs">trunk/src/wp-admin/js/updates.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsslisttablescss"></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/css/list-tables.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/list-tables.css 2015-11-18 19:58:21 UTC (rev 35680)
+++ trunk/src/wp-admin/css/list-tables.css 2015-11-18 20:09:21 UTC (rev 35681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1578,6 +1578,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline;
</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">+.plugin-card-update-failed .update-now {
+ font-weight: 600;
+}
+
+.plugin-card-update-failed .notice-error {
+ margin: 0;
+ padding-left: 16px;
+ -webkit-box-shadow: 0 -1px 0 #dedede;
+ box-shadow: 0 -1px 0 #dedede;
+}
+
+.plugin-card-update-failed .plugin-card-bottom {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .plugin-card .column-rating {
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 23px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></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/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2015-11-18 19:58:21 UTC (rev 35680)
+++ trunk/src/wp-admin/js/common.js 2015-11-18 20:09:21 UTC (rev 35681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,24 +400,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'div.updated, div.error, div.notice' ).not( '.inline, .below-h2' ).insertAfter( $( '.wrap' ).children( ':header' ).first() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make notices dismissible
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.notice.is-dismissible' ).each( function() {
- var $this = $( this ),
- $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),
- btnText = commonL10n.dismiss || '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function makeNoticesDismissible() {
+ $( '.notice.is-dismissible' ).each( function() {
+ var $el = $( this ),
+ $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),
+ btnText = commonL10n.dismiss || '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure plain text
- $button.find( '.screen-reader-text' ).text( btnText );
-
- $this.append( $button );
-
- $button.on( 'click.wp-dismiss-notice', function( event ) {
- event.preventDefault();
- $this.fadeTo( 100 , 0, function() {
- $(this).slideUp( 100, function() {
- $(this).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure plain text
+ $button.find( '.screen-reader-text' ).text( btnText );
+ $button.on( 'click.wp-dismiss-notice', function( event ) {
+ event.preventDefault();
+ $el.fadeTo( 100, 0, function() {
+ $el.slideUp( 100, function() {
+ $el.remove();
+ });
</ins><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">+
+ $el.append( $button );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ $document.on( 'wp-plugin-update-error', function() {
+ makeNoticesDismissible();
</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"> // Init screen meta
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,6 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><span class="cx" style="display: block; padding: 0 10px"> currentMenuItemHasPopup();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ makeNoticesDismissible();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpadminjsupdatesjs"></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/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/updates.js 2015-11-18 19:58:21 UTC (rev 35680)
+++ trunk/src/wp-admin/js/updates.js 2015-11-18 20:09:21 UTC (rev 35681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,13 +146,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {string} slug
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updatePlugin = function( plugin, slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $message, name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $message, name,
+ $card = $( '.plugin-card-' + slug );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $( '[data-slug="' + slug + '"]' ).next().find( '.update-message' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'plugin-install' === pagenow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = $( '.plugin-card-' + slug ).find( '.update-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $card.find( '.update-now' );
</ins><span class="cx" style="display: block; padding: 0 10px"> name = $message.data( 'name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $message.attr( 'aria-label', wp.updates.l10n.updatingLabel.replace( '%s', name ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove previous error messages, if any.
+ $card.removeClass( 'plugin-card-update-failed' ).find( '.notice.notice-error' ).remove();
</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"> $message.addClass( 'updating-message' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,24 +252,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {object} response
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateError = function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $message, name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $card = $( '.plugin-card-' + response.slug ),
+ $message,
+ $button,
+ name,
+ error_message;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateDoneSuccessfully = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' && wp.updates.shouldRequestFilesystemCredentials ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.credentialError( response, 'update-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ error_message = wp.updates.l10n.updateFailed.replace( '%s', response.error );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $( '[data-slug="' + response.slug + '"]' ).next().find( '.update-message' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message.html( error_message ).removeClass( 'updating-message' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'plugin-install' === pagenow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button = $card.find( '.update-now' );
+ name = $button.data( 'name' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name = $message.data( 'name' );
- $message.attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $card
+ .addClass( 'plugin-card-update-failed' )
+ .append( '<div class="notice notice-error is-dismissible"><p>' + error_message + '</p></div>' );
+
+ $button
+ .attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', name ) )
+ .html( wp.updates.l10n.updateFailedShort ).removeClass( 'updating-message' );
+
+ $card.on( 'click', '.notice.is-dismissible .notice-dismiss', function() {
+ // Use same delay as the total duration of the notice fadeTo + slideUp animation.
+ setTimeout( function() {
+ $card
+ .removeClass( 'plugin-card-update-failed' )
+ .find( '.column-name a' ).focus();
+ }, 200 );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message.removeClass( 'updating-message' );
- $message.html( wp.updates.l10n.updateFailed.replace( '%s', response.error ) );
- wp.a11y.speak( wp.updates.l10n.updateFailed );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.a11y.speak( error_message, 'assertive' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The lock can be released since this failure was
</span><span class="cx" style="display: block; padding: 0 10px"> * after the credentials form.
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-11-18 19:58:21 UTC (rev 35680)
+++ trunk/src/wp-includes/script-loader.php 2015-11-18 20:09:21 UTC (rev 35681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,6 +583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'l10n' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'updating' => __( 'Updating...' ), // no ellipsis
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => __( 'Updated!' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updateFailedShort' => __( 'Update Failed!' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Error string for a failed update */
</span><span class="cx" style="display: block; padding: 0 10px"> 'updateFailed' => __( 'Update Failed: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Plugin name and version */
</span></span></pre>
</div>
</div>
</body>
</html>