<!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>[31992] trunk/src: Press This:</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/31992">31992</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/31992","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-03 01:33:30 +0000 (Fri, 03 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'>Press This:
- Show a spinner while saving a post.
- Do not redirect after saving a draft.
- Make the unidentified error message clearer.
Fixes <a href="https://core.trac.wordpress.org/ticket/31875">#31875</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsspressthiscss">trunk/src/wp-admin/css/press-this.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
<li><a href="#trunksrcwpadminjspressthisjs">trunk/src/wp-admin/js/press-this.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="trunksrcwpadmincsspressthiscss"></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/press-this.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/press-this.css 2015-04-03 00:17:20 UTC (rev 31991)
+++ trunk/src/wp-admin/css/press-this.css 2015-04-03 01:33:30 UTC (rev 31992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,6 +1363,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 auto;
</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">+.spinner {
+ height: 20px;
+ width: 20px;
+ display: inline-block;
+ visibility: hidden;
+ background: url(../images/spinner.gif) no-repeat center;
+ -webkit-background-size: 20px 20px;
+ background-size: 20px 20px;
+ opacity: 0.7;
+ filter: alpha(opacity=70);
+ line-height: 30px;
+ vertical-align: baseline;
+}
+
+@media print,
+ (-webkit-min-device-pixel-ratio: 1.25),
+ (min-resolution: 120dpi) {
+
+ .spinner {
+ background-image: url(../images/spinner-2x.gif);
+ }
+}
+
+.spinner.is-visible {
+ visibility: visible;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Make the text inside the editor textarea white. Prevents a "flash" on loading the page */
</span><span class="cx" style="display: block; padding: 0 10px"> #pressthis {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppressthisphp"></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-press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-press-this.php 2015-04-03 00:17:20 UTC (rev 31991)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-04-03 01:33:30 UTC (rev 31992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,23 +148,28 @@
</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"> if ( 'publish' === get_post_status( $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filter the URL to redirect to when Press This saves.
- *
- * @since 4.2.0
- *
- * @param string $url Redirect URL. If `$status` is 'publish', this will be the post permalink.
- * Otherwise, the post edit URL will be used.
- * @param int $post_id Post ID.
- * @param string $status Post status.
- */
- $redirect = apply_filters( 'press_this_save_redirect', get_post_permalink( $post_id ), $post_id, $post['post_status'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect = get_post_permalink( $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in wp-admin/includes/class-wp-press-this.php */
- $redirect = apply_filters( 'press_this_save_redirect', get_edit_post_link( $post_id, 'raw' ), $post_id, $post['post_status'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect = false;
</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">- wp_send_json_success( array( 'redirect' => $redirect ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filter the URL to redirect to when Press This saves.
+ *
+ * @since 4.2.0
+ *
+ * @param string $url Redirect URL. If `$status` is 'publish', this will be the post permalink.
+ * Otherwise, the post edit URL will be used.
+ * @param int $post_id Post ID.
+ * @param string $status Post status.
+ */
+ $redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post['post_status'] );
+
+ if ( $redirect ) {
+ wp_send_json_success( array( 'redirect' => $redirect ) );
+ } else {
+ wp_send_json_success( array( 'postSaved' => true ) );
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1339,6 +1344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="post-actions">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="spinner"> </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-subtle draft-button"><?php _e( 'Save Draft' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-subtle preview-button"><?php _e( 'Preview' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-primary publish-button"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></button>
</span></span></pre></div>
<a id="trunksrcwpadminjspressthisjs"></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/press-this.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/press-this.js 2015-04-03 00:17:20 UTC (rev 31991)
+++ trunk/src/wp-admin/js/press-this.js 2015-04-03 01:33:30 UTC (rev 31992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Show UX spinner
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function showSpinner() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#spinner' ).addClass( 'show' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.spinner' ).addClass( 'is-visible' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.post-actions button' ).each( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'disabled', 'disabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Hide UX spinner
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function hideSpinner() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#spinner' ).removeClass( 'show' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.spinner' ).removeClass( 'is-visible' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.post-actions button' ).each( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).removeAttr( 'disabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,24 +181,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.ajax( {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> url: window.ajaxurl,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data: data,
- success: function( response ) {
- if ( ! response.success ) {
- renderError( response.data.errorMessage );
- hideSpinner();
- } else if ( response.data.redirect ) {
- if ( window.opener && settings.redirInParent ) {
- try {
- window.opener.location.href = response.data.redirect;
- } catch( er ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data: data
+ }).always( function() {
+ hideSpinner();
+ }).done( function( response ) {
+ if ( ! response.success ) {
+ renderError( response.data.errorMessage );
+ } else if ( response.data.redirect ) {
+ if ( window.opener && settings.redirInParent ) {
+ try {
+ window.opener.location.href = response.data.redirect;
+ } catch( er ) {}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.self.close();
- } else {
- window.location.href = response.data.redirect;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.self.close();
+ } else {
+ window.location.href = response.data.redirect;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( response.data.postSaved ) {
+ // show "success" message?
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }).fail( function() {
+ renderError( __( 'serverError' ) );
+ });
</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>
<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-03 00:17:20 UTC (rev 31991)
+++ trunk/src/wp-includes/script-loader.php 2015-04-03 01:33:30 UTC (rev 31992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'newPost' => __( 'Title' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'unexpectedError' => __( 'Sorry, but an unexpected error occurred.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: nth embed found in a post */
</span><span class="cx" style="display: block; padding: 0 10px"> 'suggestedEmbedAlt' => __( 'Suggested embed #%d' ),
</span></span></pre>
</div>
</div>
</body>
</html>