<!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>[32092] 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/32092">32092</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/32092","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-08 23:13:35 +0000 (Wed, 08 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:
- When saving a draft change the text of the Save Draft button to Saving...
- On success, hide the button and show Edit Post link in its place. If the user focuses the title or the editor, hide the link and show the button again.
Fixes <a href="https://core.trac.wordpress.org/ticket/31923">#31923</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-04-08 22:27:57 UTC (rev 32091)
+++ trunk/src/wp-admin/css/press-this.css 2015-04-08 23:13:35 UTC (rev 32092)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,12 +341,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .button-subtle:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .button-subtle:hover,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.button-subtle:active {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.button-subtle:active,
+.edit-post-link:focus,
+.edit-post-link:hover,
+.edit-post-link:active {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #00a0d2;
</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"> .button-subtle:focus,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.button-subtle:active {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.button-subtle:active,
+.edit-post-link:focus,
+.edit-post-link:active {
</ins><span class="cx" style="display: block; padding: 0 10px"> outline: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: underline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,8 +1378,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-size: 20px 20px;
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0.7;
</span><span class="cx" style="display: block; padding: 0 10px"> filter: alpha(opacity=70);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- line-height: 30px;
- vertical-align: baseline;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ line-height: 1;
+ vertical-align: middle;
</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"> @media print,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1734,7 +1739,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .post-actions {
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 14px 30px 14px 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-size: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ font-size: 13px;
</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"> @media (max-width: 320px) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1743,6 +1748,23 @@
</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">+.edit-post-link {
+ font-size: 13px;
+ display: inline-block;
+ text-decoration: none;
+ padding: 0 10px;
+}
+
+.draft-button.is-hidden,
+.draft-button .saving-draft,
+.draft-button.is-saving .save-draft {
+ display: none;
+}
+
+.draft-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-04-08 22:27:57 UTC (rev 32091)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-04-08 23:13:35 UTC (rev 32092)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1430,7 +1430,11 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"> </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" class="button-subtle draft-button"><?php _e( 'Save Draft' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-subtle draft-button" aria-live="polite">
+ <span class="save-draft"><?php _e( 'Save Draft' ); ?></span>
+ <span class="saving-draft"><?php _e( 'Saving...' ); ?></span>
+ </button>
+ <a href="<?php echo esc_url( get_edit_post_link( $post_ID ) ); ?>" class="edit-post-link" style="display: none;" target="_blank"><?php _e( 'Edit Post' ); ?></a>
</ins><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 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-04-08 22:27:57 UTC (rev 32091)
+++ trunk/src/wp-admin/js/press-this.js 2015-04-08 23:13:35 UTC (rev 32092)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data: data
</span><span class="cx" style="display: block; padding: 0 10px"> }).always( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> hideSpinner();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ clearNotices();
</ins><span class="cx" style="display: block; padding: 0 10px"> }).done( function( response ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $link, $button, keepFocus;
+
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,13 +201,33 @@
</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><span class="cx" style="display: block; padding: 0 10px"> } else if ( response.data.postSaved ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // show "success" message?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = $( '.edit-post-link' );
+ $button = $( '.draft-button' );
+
+ if ( document.activeElement && document.activeElement.className.indexOf( 'draft-button' ) > -1 ) {
+ keepFocus = true;
+ }
+
+ $button.fadeOut( 200, function() {
+ $button.removeClass( 'is-saving' );
+ $link.fadeIn( 200 );
+
+ if ( keepFocus ) {
+ $link.focus();
+ }
+ });
</ins><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="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">+ function resetDraftButton() {
+ $( '.edit-post-link' ).fadeOut( 200, function() {
+ $( '.draft-button' ).removeClass( 'is-saving' ).fadeIn( 200 );
+ });
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Inserts the media a user has selected from the presented list inside the editor, as an image or embed, based on type
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,6 +351,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> renderNotice( msg, true );
</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">+ function clearNotices() {
+ $( 'div.alerts' ).empty();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Render notices on page load, if any already
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,6 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $titleField.on( 'focus', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $placeholder.addClass( 'is-hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ resetDraftButton();
</ins><span class="cx" style="display: block; padding: 0 10px"> }).on( 'blur', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $titleField.text() && ! $titleField.html() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $placeholder.removeClass( 'is-hidden' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,13 +651,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set app events and other state monitoring related code.
</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 monitor(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function monitor() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( document ).on( 'tinymce-editor-init', function( event, ed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor = ed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ed.on( 'focus', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function focus() {
</ins><span class="cx" style="display: block; padding: 0 10px"> hasSetFocus = true;
</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">+ resetDraftButton();
+ }
+
+ if ( window.tinymce.Env.iOS ) {
+ editor.on( 'click', focus );
+ } else {
+ editor.on( 'focus', focus );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }).on( 'click.press-this keypress.press-this', '.suggested-media-thumbnail', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.type === 'click' || event.keyCode === 13 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> insertSelectedMedia( $( this ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,21 +672,27 @@
</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"> // Publish, Draft and Preview buttons
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $( '.post-actions' ).on( 'click.press-this', function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $target = $( event.target );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $target = $( event.target ),
+ $button = $target.closest( 'button' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $target.hasClass( 'draft-button' ) ) {
- submitPost( 'draft' );
- } else if ( $target.hasClass( 'publish-button' ) ) {
- submitPost( 'publish' );
- } else if ( $target.hasClass( 'preview-button' ) ) {
- prepareFormData();
- window.opener && window.opener.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $button.length ) {
+ if ( $button.hasClass( 'draft-button' ) ) {
+ $button.addClass( 'is-saving' );
+ submitPost( 'draft' );
+ } else if ( $button.hasClass( 'publish-button' ) ) {
+ submitPost( 'publish' );
+ } else if ( $button.hasClass( 'preview-button' ) ) {
+ prepareFormData();
+ window.opener && window.opener.focus();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#wp-preview' ).val( 'dopreview' );
- $( '#pressthis-form' ).attr( 'target', '_blank' ).submit().attr( 'target', '' );
- $( '#wp-preview' ).val( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#wp-preview' ).val( 'dopreview' );
+ $( '#pressthis-form' ).attr( 'target', '_blank' ).submit().attr( 'target', '' );
+ $( '#wp-preview' ).val( '' );
+ }
+ } else if ( $target.hasClass( 'edit-post-link' ) && window.opener ) {
+ window.opener.focus();
+ window.self.close();
</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>