Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 02:10:45 +01:00
Code Issues Projects Releases Wiki Activity

PressThis: add preview functionality. Opens the preview in a new window or a tab next to the source tab.

Browse Source 
Fixes #31458.
Built from https://develop.svn.wordpress.org/trunk@31654


git-svn-id: http://core.svn.wordpress.org/trunk@31635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-03-07 01:17:26 +00:00
parent b421255fc8
commit 9716d171c7
8 changed files with 79 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/css/press-this-rtl.css
View File

@ -351,6 +351,10 @@ strong {
text-decoration: underline; text-decoration: underline;
} }
.preview-button {
margin-left: 1em;
}
.button-reset { .button-reset {
margin: 0; margin: 0;
padding: 0; padding: 0;

2
wp-admin/css/press-this-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/press-this.css
View File

@ -351,6 +351,10 @@ strong {
text-decoration: underline; text-decoration: underline;
} }
.preview-button {
margin-right: 1em;
}
.button-reset { .button-reset {
margin: 0; margin: 0;
padding: 0; padding: 0;

2
wp-admin/css/press-this.min.css vendored
View File

File diff suppressed because one or more lines are too long

53
wp-admin/includes/class-wp-press-this.php
View File

@ -133,22 +133,20 @@ class WP_Press_This {
* @access public * @access public
*/ */
public function save_post() { public function save_post() {
if ( empty( $_POST['pressthis-nonce'] ) || ! wp_verify_nonce( $_POST['pressthis-nonce'], 'press-this' ) ) {
wp_send_json_error( array( 'errorMessage' => __( 'Cheatin’ uh?' ) ) );
}
if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) { if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) {
wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) ); wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) );
} }
if ( ! current_user_can( 'edit_post', $post_id ) ) { if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'update-post_' . $post_id ) ||
wp_send_json_error( array( 'errorMessage' => __( 'Cheatin’ uh?' ) ) ); ! current_user_can( 'edit_post', $post_id ) ) {
wp_send_json_error( array( 'errorMessage' => __( 'Invalid post.' ) ) );
} }
$post = array( $post = array(
'ID' => $post_id, 'ID' => $post_id,
'post_title' => ( ! empty( $_POST['title'] ) ) ? sanitize_text_field( trim( $_POST['title'] ) ) : '', 'post_title' => ( ! empty( $_POST['post_title'] ) ) ? sanitize_text_field( trim( $_POST['post_title'] ) ) : '',
'post_content' => ( ! empty( $_POST['pressthis'] ) ) ? trim( $_POST['pressthis'] ) : '', 'post_content' => ( ! empty( $_POST['post_content'] ) ) ? trim( $_POST['post_content'] ) : '',
'post_type' => 'post', 'post_type' => 'post',
'post_status' => 'draft', 'post_status' => 'draft',
'post_format' => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '', 'post_format' => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
@ -887,7 +885,7 @@ class WP_Press_This {
<!--[if IE 8]> <html class="lt-ie9" <?php language_attributes(); ?>> <![endif]--> <!--[if IE 8]> <html class="lt-ie9" <?php language_attributes(); ?>> <![endif]-->
<!--[if gt IE 8]><!--> <html <?php language_attributes(); ?>> <!--<![endif]--> <!--[if gt IE 8]><!--> <html <?php language_attributes(); ?>> <!--<![endif]-->
<head> <head>
<meta http-equiv="Content-Type" content="<?php esc_attr( bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" /> <meta http-equiv="Content-Type" content="<?php echo esc_attr( get_bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" />
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width">
<title><?php esc_html_e( 'Press This!' ) ?></title> <title><?php esc_html_e( 'Press This!' ) ?></title>
@ -954,15 +952,17 @@ class WP_Press_This {
?> ?>
</head> </head>
<?php <?php
$admin_body_class = 'press-this';
$admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
/** This filter is documented in wp-admin/admin-header.php */ $admin_body_class = 'press-this';
$admin_body_classes = apply_filters( 'admin_body_class', '' ); $admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
/** This filter is documented in wp-admin/admin-header.php */
$admin_body_classes = apply_filters( 'admin_body_class', '' );
?> ?>
<body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>"> <body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
<div id="adminbar" class="adminbar"> <div id="adminbar" class="adminbar">
@ -984,15 +984,18 @@ $admin_body_classes = apply_filters( 'admin_body_class', '' );
</form> </form>
</div> </div>
<form id="pressthis-form" name="pressthis-form" method="POST" autocomplete="off"> <form id="pressthis-form" method="post" action="post.php" autocomplete="off">
<input type="hidden" name="post_ID" id="post_ID" value="<?php echo $post_ID; ?>" /> <input type="hidden" name="post_ID" id="post_ID" value="<?php echo $post_ID; ?>" />
<input type="hidden" name="action" value="press-this-save-post" /> <input type="hidden" name="action" value="press-this-save-post" />
<input type="hidden" name="post_status" id="post_status" value="draft" /> <input type="hidden" name="post_status" id="post_status" value="draft" />
<input type="hidden" name="wp-preview" id="wp-preview" value="" />
<input type="hidden" name="post_title" id="post_title" value="" />
<?php <?php
wp_nonce_field( 'press-this', 'pressthis-nonce', false );
wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false ); wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false );
?> ?>
<input type="hidden" name="title" id="title-field" value="" />
<div class="wrapper"> <div class="wrapper">
<div class="editor-wrapper"> <div class="editor-wrapper">
@ -1016,6 +1019,7 @@ $admin_body_classes = apply_filters( 'admin_body_class', '' );
'drag_drop_upload' => true, 'drag_drop_upload' => true,
'editor_height' => 600, 'editor_height' => 600,
'media_buttons' => false, 'media_buttons' => false,
'textarea_name' => 'post_content',
'teeny' => true, 'teeny' => true,
'tinymce' => array( 'tinymce' => array(
'resize' => false, 'resize' => false,
@ -1028,7 +1032,7 @@ $admin_body_classes = apply_filters( 'admin_body_class', '' );
'toolbar1' => 'bold,italic,bullist,numlist,blockquote,link,unlink', 'toolbar1' => 'bold,italic,bullist,numlist,blockquote,link,unlink',
'toolbar2' => 'undo,redo', 'toolbar2' => 'undo,redo',
), ),
'quicktags' => false, 'quicktags' => false,
) ); ) );
?> ?>
@ -1051,14 +1055,12 @@ $admin_body_classes = apply_filters( 'admin_body_class', '' );
<button type="button" class="button-reset post-option"> <button type="button" class="button-reset post-option">
<span class="dashicons dashicons-category"></span> <span class="dashicons dashicons-category"></span>
<span class="post-option-title"><?php _e( 'Categories' ); ?></span> <span class="post-option-title"><?php _e( 'Categories' ); ?></span>
<span class="post-option-contents" id="post-option-category"></span>
<span class="dashicons post-option-forward"></span> <span class="dashicons post-option-forward"></span>
</button> </button>
<button type="button" class="button-reset post-option"> <button type="button" class="button-reset post-option">
<span class="dashicons dashicons-tag"></span> <span class="dashicons dashicons-tag"></span>
<span class="post-option-title"><?php _e( 'Tags' ); ?></span> <span class="post-option-title"><?php _e( 'Tags' ); ?></span>
<span class="post-option-contents" id="post-option-tags"></span>
<span class="dashicons post-option-forward"></span> <span class="dashicons post-option-forward"></span>
</button> </button>
</div> </div>
@ -1102,8 +1104,9 @@ $admin_body_classes = apply_filters( 'admin_body_class', '' );
</button> </button>
</div> </div>
<div class="post-actions"> <div class="post-actions">
<button type="button" class="button-subtle" id="draft-field"><?php _e( 'Save Draft' ); ?></button> <button type="button" class="button-subtle draft-button"><?php _e( 'Save Draft' ); ?></button>
<button type="button" class="button-primary" id="publish-field"><?php _e( 'Publish' ); ?></button> <button type="button" class="button preview-button"><?php _e( 'Preview' ); ?></button>
<button type="button" class="button-primary publish-button"><?php _e( 'Publish' ); ?></button>
</div> </div>
</div> </div>
</form> </form>

62
wp-admin/js/press-this.js
View File

@ -303,23 +303,12 @@
} }
/** /**
* Submit the post form via AJAX, and redirect to the proper screen if published vs saved as a draft. * Prepare the form data for saving.
* */
* @param action string publish|draft function prepareFormData() {
*/
function submitPost( action ) {
saveAlert = false;
showSpinner();
var $form = $( '#pressthis-form' );
if ( 'publish' === action ) {
$( '#post_status' ).val( 'publish' );
}
editor && editor.save(); editor && editor.save();
$( '#title-field' ).val( sanitizeText( $( '#title-container' ).text() ) ); $( '#post_title' ).val( sanitizeText( $( '#title-container' ).text() ) );
// Make sure to flush out the tags with tagBox before saving // Make sure to flush out the tags with tagBox before saving
if ( window.tagBox ) { if ( window.tagBox ) {
@ -327,8 +316,25 @@
window.tagBox.flushTags( this, false, 1 ); window.tagBox.flushTags( this, false, 1 );
} ); } );
} }
}
var data = $form.serialize(); /**
* Submit the post form via AJAX, and redirect to the proper screen if published vs saved as a draft.
*
* @param action string publish|draft
*/
function submitPost( action ) {
var data;
saveAlert = false;
showSpinner();
if ( 'publish' === action ) {
$( '#post_status' ).val( 'publish' );
}
prepareFormData();
data = $( '#pressthis-form' ).serialize();
$.ajax( { $.ajax( {
type: 'post', type: 'post',
@ -502,7 +508,7 @@
$title = $( '#title-container' ); $title = $( '#title-container' );
if ( ! hasEmptyTitleStr ) { if ( ! hasEmptyTitleStr ) {
$( '#title-field' ).val( suggestedTitle ); $( '#post_title' ).val( suggestedTitle );
$title.text( suggestedTitle ); $title.text( suggestedTitle );
$( '.post-title-placeholder' ).addClass( 'is-hidden' ); $( '.post-title-placeholder' ).addClass( 'is-hidden' );
} }
@ -756,14 +762,24 @@
} ); } );
// Publish and Draft buttons and submit // Publish and Draft buttons and submit
$( '#draft-field' ).on( 'click', function() { $( '.post-actions' ).on( 'click.press-this', function( event ) {
submitPost( 'draft' ); var $target = $( event.target );
} );
$( '#publish-field' ).on( 'click', function() { if ( $target.hasClass( 'draft-button' ) ) {
submitPost( 'publish' ); submitPost( 'draft' );
} ); } else if ( $target.hasClass( 'publish-button' ) ) {
submitPost( 'publish' );
} else if ( $target.hasClass( 'preview-button' ) ) {
prepareFormData();
window.opener && window.opener.focus();
$( '#wp-preview' ).val( 'dopreview' );
$( '#pressthis-form' ).attr( 'target', '_blank' ).submit().attr( 'target', '' );
$( '#wp-preview' ).val( '' );
}
});
monitorOptionsModal(); monitorOptionsModal();
monitorPlaceholder(); monitorPlaceholder();

2
wp-admin/js/press-this.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31653'; $wp_version = '4.2-alpha-31654';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.