<!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>[31982] trunk/src: Update aria-label when doing a shiny plugin update</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/31982">31982</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/31982","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-02 05:30:13 +0000 (Thu, 02 Apr 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'>Update aria-label when doing a shiny plugin update
Also updates it again when the shiny plugin update is finished.
Also updates it if the shiny update fails
props mehulkaklotar, afercia
Fixes <a href="https://core.trac.wordpress.org/ticket/31722">#31722</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</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="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2015-04-02 05:26:22 UTC (rev 31981)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2015-04-02 05:30:13 UTC (rev 31982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,14 +402,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $status['url'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Plugin name and version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
</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"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update_available':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $status['url'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Plugin name and version */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '">' . __( 'Update Now' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
</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"> break;
</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-04-02 05:26:22 UTC (rev 31981)
+++ trunk/src/wp-admin/js/updates.js 2015-04-02 05:30:13 UTC (rev 31982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filesystem credentials to be packaged along with the request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.2.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,10 +96,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.decrementCount = function( upgradeType ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var count,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- pluginCount,
- $adminBarUpdateCount = $( '#wp-admin-bar-updates .ab-label' ),
- $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ),
- $pluginsMenuItem = $( '#menu-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pluginCount,
+ $adminBarUpdateCount = $( '#wp-admin-bar-updates .ab-label' ),
+ $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ),
+ $pluginsMenuItem = $( '#menu-plugins' );
</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"> count = $adminBarUpdateCount.text();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,11 +145,13 @@
</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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $message, name;
</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><span class="cx" style="display: block; padding: 0 10px"> $message = $( '.plugin-card-' + slug ).find( '.update-now' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name = $message.data( 'name' );
+ $message.attr( 'aria-label', wp.updates.l10n.updatingLabel.replace( '%s', name ) );
</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">@@ -198,14 +200,14 @@
</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.updateSuccess = function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $updateMessage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $updateMessage, name, $pluginRow, newText;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
</ins><span class="cx" style="display: block; padding: 0 10px"> $updateMessage = $pluginRow.next().find( '.update-message' );
</span><span class="cx" style="display: block; padding: 0 10px"> $pluginRow.addClass( 'updated' ).removeClass( 'update' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the version number in the row.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var newText = $pluginRow.find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ newText = $pluginRow.find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
</ins><span class="cx" style="display: block; padding: 0 10px"> $pluginRow.find('.plugin-version-author-uri').html( newText );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add updated class to update message parent tr
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,6 +215,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'plugin-install' === pagenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $updateMessage = $( '.plugin-card-' + response.slug ).find( '.update-now' );
</span><span class="cx" style="display: block; padding: 0 10px"> $updateMessage.addClass( 'button-disabled' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name = $updateMessage.data( 'name' );
+ $updateMessage.attr( 'aria-label', wp.updates.l10n.updatedLabel.replace( '%s', name ) );
</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"> $updateMessage.removeClass( 'updating-message' ).addClass( 'updated-message' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +244,7 @@
</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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $message, name;
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateDoneSuccessfully = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.credentialError( response, 'update-plugin' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +254,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $( '[data-slug="' + response.slug + '"]' ).next().find( '.update-message' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'plugin-install' === pagenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ name = $message.data( 'name' );
+ $message.attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $message.removeClass( 'updating-message' );
</span><span class="cx" style="display: block; padding: 0 10px"> $message.text( wp.updates.l10n.updateFailed );
</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-04-02 05:26:22 UTC (rev 31981)
+++ trunk/src/wp-includes/script-loader.php 2015-04-02 05:30:13 UTC (rev 31982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,12 +525,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajax_nonce' => wp_create_nonce( 'updates' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'l10n' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'updating' => __( 'Updating...' ),
- 'updated' => __( 'Updated!' ),
- 'updateFailed' => __( 'Update failed.' ),
- 'updatingMsg' => __( 'Updating... please wait.' ),
- 'updatedMsg' => __( 'Update completed successfully.' ),
- 'updateCancel' => __( 'Update canceled' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updating' => __( 'Updating...' ),
+ 'updated' => __( 'Updated!' ),
+ 'updateFailed' => __( 'Update Failed' ),
+ /* translators: Plugin Name */
+ 'updatingLabel' => __( 'Updating %s...' ),
+ /* translators: Plugin Name */
+ 'updatedLabel' => __( '%s updated!' ),
+ /* translators: Plugin Name */
+ 'updateFailedLabel' => __( '%s update failed' ),
+ 'updatingMsg' => __( 'Updating... please wait.' ),
+ 'updatedMsg' => __( 'Update completed successfully.' ),
+ 'updateCancel' => __( 'Update canceled.' ),
</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>