<!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>[31409] trunk/src: Shiny Updates: Replace `$.post()` calls with `wp.ajax.post()`, and clean up a bunch of the now unnecessary code.</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/31409">31409</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/31409","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-11 05:05:13 +0000 (Wed, 11 Feb 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'>Shiny Updates: Replace `$.post()` calls with `wp.ajax.post()`, and clean up a bunch of the now unnecessary code.
See <a href="https://core.trac.wordpress.org/ticket/29820">#29820</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="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-02-11 03:59:06 UTC (rev 31408)
+++ trunk/src/wp-admin/js/updates.js 2015-02-11 05:05:13 UTC (rev 31409)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function( $, wp, pagenow, ajaxurl ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+(function( $, wp, pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.updates = {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,48 +122,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateLock = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var data = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'action': 'update-plugin',
</del><span class="cx" style="display: block; padding: 0 10px"> '_ajax_nonce': wp.updates.ajaxNonce,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin': plugin,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug': slug
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax( {
- type: 'post',
- url: ajaxurl,
- data: data,
- complete: wp.updates.updateRequestComplete
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.ajax.post( 'update-plugin', data )
+ .done( wp.updates.updateSuccess )
+ .fail( wp.updates.updateError )
+ .always( wp.updates.updateAlways );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * After an update attempt has completed, deal with the response.
- *
- * @since 4.2.0
- *
- * @param {jqXHR} jqxhr The jQuery XMLHttpRequest for the request.
- */
- wp.updates.updateRequestComplete = function( jqxhr ) {
- wp.updates.updateLock = false;
- if ( jqxhr.responseJSON && jqxhr.responseJSON.success ) {
- wp.updates.updateSuccess( jqxhr.responseJSON );
- } else {
- var alertText = wp.updates.l10n.updateFailed;
- if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) {
- alertText += ': ' + jqxhr.responseJSON.data.error;
- }
- window.alert( alertText );
- if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) {
- wp.updates.updateError( jqxhr.responseJSON );
- }
- }
- /**
- * Check the queue.
- */
- wp.updates.queueChecker();
- };
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * On a successful plugin update, update the UI with the result.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,11 +143,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateSuccess = function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $message;
</span><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">- $message = $( '#' + response.data.slug ).next().find( '.update-message' );
- $( '#' + response.data.slug ).addClass( 'updated' ).removeClass( 'update' );
- $( '#' + response.data.slug + '-update' ).addClass( 'updated' ).removeClass( 'update' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $( '#' + response.slug ).next().find( '.update-message' );
+ $( '#' + response.slug ).addClass( 'updated' ).removeClass( 'update' );
+ $( '#' + response.slug + '-update' ).addClass( 'updated' ).removeClass( 'update' );
</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.data.slug ).find( '.update-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $message.addClass( 'button-disabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,15 +167,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateError = function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $message;
</span><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">- $message = $( '#' + response.data.slug ).next().find( '.update-message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $( '#' + response.slug ).next().find( '.update-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.data.slug ).find( '.update-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
</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 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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * After an update attempt has completed, check the queue.
+ *
+ * @since 4.2.0
+ */
+ wp.updates.updateAlways = function() {
+ wp.updates.updateLock = false;
+ wp.updates.queueChecker();
+ };
+
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Send an Ajax request to the server to install a plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,48 +212,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.updates.updateLock = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var data = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'action': 'install-plugin',
</del><span class="cx" style="display: block; padding: 0 10px"> '_ajax_nonce': wp.updates.ajaxNonce,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug': slug
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax( {
- type: 'post',
- url: ajaxurl,
- data: data,
- complete: wp.updates.installRequestComplete
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.ajax.post( 'install-plugin', data )
+ .done( wp.updates.installSuccess )
+ .fail( wp.updates.installError )
+ .always( wp.updates.updateAlways );
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * After an installation attempt has completed, deal with the response.
- *
- * @since 4.2.0
- *
- * @param {jqXHR} jqxhr The jQuery XMLHttpRequest for the request.
- */
- wp.updates.installRequestComplete = function( jqxhr ) {
- wp.updates.updateLock = false;
- if ( jqxhr.responseJSON && jqxhr.responseJSON.success ) {
- wp.updates.installSuccess( jqxhr.responseJSON );
- } else {
- var alertText = wp.updates.l10n.installFailed;
- if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.error ) {
- alertText += ': ' + jqxhr.responseJSON.data.error;
- }
- window.alert( alertText );
- if ( jqxhr.responseJSON && jqxhr.responseJSON.data && jqxhr.responseJSON.data.slug ) {
- wp.updates.installError( jqxhr.responseJSON );
- }
- }
- /**
- * Check the queue.
- */
- wp.updates.queueChecker();
- };
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * On plugin install success, update the UI with the result.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +230,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.installSuccess = function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $message = $( '.plugin-card-' + response.data.slug ).find( '.install-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message.removeClass( 'updating-message' ).addClass( 'updated-message button-disabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> $message.text( wp.updates.l10n.installed );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,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.installError = function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $message = $( '.plugin-card-' + response.data.slug ).find( '.install-now' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
</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.installNow );
</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-02-11 03:59:06 UTC (rev 31408)
+++ trunk/src/wp-includes/script-loader.php 2015-02-11 05:05:13 UTC (rev 31409)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +500,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ays' => __('Are you sure you want to install this plugin?')
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util' ) );
</ins><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></span></pre>
</div>
</div>
</body>
</html>