<!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>[32983] trunk/src/wp-admin: 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/32983">32983</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/32983","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-06-28 04:58:56 +0000 (Sun, 28 Jun 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:
- Save a draft before opening the standard editor window.
- While saving a post show Saving... instead of Publish for the main visible part of the split button (same as the Save Draft button before).
See <a href="https://core.trac.wordpress.org/ticket/32757">#32757</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>
</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-06-28 04:44:03 UTC (rev 32982)
+++ trunk/src/wp-admin/css/press-this.css 2015-06-28 04:58:56 UTC (rev 32983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1888,6 +1888,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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">+.publish-button .saving-draft,
+.publish-button.is-saving .publish {
+ display: none;
+}
+
+.publish-button.is-saving .saving-draft {
+ display: inline;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* TinyMCE styles */
</span><span class="cx" style="display: block; padding: 0 10px"> .editor .wp-media-buttons {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</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-06-28 04:44:03 UTC (rev 32982)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-06-28 04:58:56 UTC (rev 32983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,8 +146,13 @@
</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">+ $forceRedirect = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' === get_post_status( $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = get_post_permalink( $post_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+ $forceRedirect = true;
+ $redirect = get_edit_post_link( $post_id, 'js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect ) {
</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">+ wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( array( 'postSaved' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,6 +1334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_status" id="post_status" value="draft" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="wp-preview" id="wp-preview" value="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_title" id="post_title" value="" />
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1456,16 +1462,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="split-button">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="split-button-head">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" class="publish-button split-button-primary"><?php
- echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' );
- ?></button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="publish-button split-button-primary" aria-live="polite">
+ <span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
+ <span class="saving-draft"><?php _e( 'Saving...' ); ?></span>
+ </button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
</ins><span class="cx" style="display: block; padding: 0 10px"> <i class="dashicons dashicons-arrow-down-alt2"></i>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="screen-reader-text"><?php _e('More actions'); ?></span>
</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"> <ul class="split-button-body">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><button type="button" class="button-subtle draft-button split-button-option" aria-live="polite"><?php _e( 'Save Draft' ); ?></button></li>
- <li><a href="<?php echo esc_url( get_edit_post_link( $post_ID ) ); ?>" class="edit-post-link split-button-option" target="_blank"><?php _e( 'Standard Editor' ); ?></a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><button type="button" class="button-subtle draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
+ <li><button type="button" class="button-subtle standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><button type="button" class="button-subtle preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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-06-28 04:44:03 UTC (rev 32982)
+++ trunk/src/wp-admin/js/press-this.js 2015-06-28 04:58:56 UTC (rev 32983)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,21 +182,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }).always( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> hideSpinner();
</span><span class="cx" style="display: block; padding: 0 10px"> clearNotices();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.publish-button' ).removeClass( 'is-saving' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }).done( function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! response.success ) {
</span><span class="cx" style="display: block; padding: 0 10px"> renderError( response.data.errorMessage );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( response.data.redirect ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.opener && settings.redirInParent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.opener && ( settings.redirInParent || response.data.force ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> window.opener.location.href = response.data.redirect;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch( er ) {}
</del><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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setTimeout( function() {
+ window.self.close();
+ }, 200 )
+ } catch( er ) {
+ window.location.href = response.data.redirect;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> window.location.href = response.data.redirect;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( response.data.postSaved ) {
- // consider showing "Saved" message
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }).fail( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> renderError( __( 'serverError' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,8 +663,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $button.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $button.hasClass( 'draft-button' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.publish-button' ).addClass( 'is-saving' );
</ins><span class="cx" style="display: block; padding: 0 10px"> submitPost( 'draft' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( $button.hasClass( 'publish-button' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button.addClass( 'is-saving' );
</ins><span class="cx" style="display: block; padding: 0 10px"> submitPost( 'publish' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( $button.hasClass( 'preview-button' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> prepareFormData();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,6 +675,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wp-preview' ).val( 'dopreview' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#pressthis-form' ).attr( 'target', '_blank' ).submit().attr( 'target', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wp-preview' ).val( '' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( $button.hasClass( 'standard-editor-button' ) ) {
+ $( '.publish-button' ).addClass( 'is-saving' );
+ $( '#pt-force-redirect' ).val( 'true' );
+ submitPost( 'draft' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( $button.hasClass( 'split-button-toggle' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $splitButton.hasClass( 'is-open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $splitButton.removeClass( 'is-open' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,9 +688,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $button.attr( 'aria-expanded', 'true' );
</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">- } else if ( $target.hasClass( 'edit-post-link' ) && window.opener ) {
- window.opener.focus();
- window.self.close();
</del><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>