Changeset 9451

Timestamp:

10/31/2008 10:47:07 PM (18 years ago)

Author:

azaozz

Message:

Preview for both drafts and published posts/pages

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/edit-page-form.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/js/editor.js (modified) (1 diff)
• wp-admin/js/page.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (2 diffs)
• wp-admin/page.php (modified) (2 diffs)
• wp-admin/post.php (modified) (2 diffs)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -171 +171 @@
 <?php } ?>
 
+<noscript>
 <?php if ( 'publish' == $post->post_status ) { ?>
 <a class="preview button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View Post'); ?></a>
@@ -176 +177 @@
 <a class="preview button" href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview'); ?></a>
 <?php } ?>
+</noscript>
+
+<a class="preview button hide-if-no-js" href="#" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a>
+<input type="hidden" name="wp-preview" id="wp-preview" value="" />
+
 </div>
 <div class="clear"></div>

trunk/wp-admin/edit-page-form.php

@@ -161 +161 @@
 <?php } ?>
 
+<noscript>
 <?php if ( 'publish' == $post->post_status ) { ?>
 <a class="preview button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View Post'); ?></a>
@@ -166 +167 @@
 <a class="preview button" href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview'); ?></a>
 <?php } ?>
+</noscript>
+
+<a class="preview button hide-if-no-js" href="#" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a>
+<input type="hidden" name="wp-preview" id="wp-preview" value="" />
+
 </div>
 <div class="clear"></div>

trunk/wp-admin/includes/post.php

@@ -988 +988 @@
 
 /**
- * wp_tiny_mce() - adds the TinyMCE editor used on the Write and Edit screens.
+ * Save draft or manually autosave for showing preview.
+ *
+ * @package WordPress
+ * @since 2.7
+ * 
+ * @uses wp_write_post()
+ * @uses edit_post()
+ * @uses get_post()
+ * @uses current_user_can()
+ * @uses wp_create_post_autosave()
+ * 
+ * @return int|object the saved post id or wp_error object
+ */
+function post_preview() {
+
+        $_POST['post_category'] = explode(",", $_POST['catslist']);
+        $_POST['tags_input'] = explode(",", $_POST['tags_input']);
+        if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
+                unset($_POST['post_category']);
+
+        if($_POST['post_ID'] < 0) {
+                $_POST['post_status'] = 'draft';
+                $_POST['temp_ID'] = $_POST['post_ID'];
+                $id = wp_write_post();
+        } else {
+                $post_ID = (int) $_POST['post_ID'];
+                $_POST['ID'] = $post_ID;
+                $post = get_post($post_ID);
+
+                if ( 'page' == $post->post_type ) {
+                        if ( !current_user_can('edit_page', $post_ID) )
+                                die(__('You are not allowed to edit this page.'));
+                } else {
+                        if ( !current_user_can('edit_post', $post_ID) )
+                                die(__('You are not allowed to edit this post.'));
+                }
+
+                if ( 'draft' == $post->post_status ) {
+                        $id = edit_post();
+                } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
+                        wp_create_post_autosave( $post->ID );
+                        $id = $post->ID;
+                }
+        }
+
+        return $id;
+}
+
+/**
+ * Adds the TinyMCE editor used on the Write and Edit screens.
  * 
  * Has option to output a trimmed down version used in Press This.

trunk/wp-admin/js/editor.js

@@ -25 +25 @@
         saveCallback : function(el, content, body) {
 
-                this.I(el).style.color = '#fff';
                 if ( tinyMCE.activeEditor.isHidden() )
                         content = this.I(el).value;

trunk/wp-admin/js/page.js

@@ -106 +106 @@
                 return false;
         });
+        
+        // preview
+        $('#post-preview').click(function(e){
+                $('input#wp-preview').val('dopreview');
+                $('form#post').attr('target', 'wp-preview').submit().attr('target', '');
+                $('input#wp-preview').val('');
+        });
 });

trunk/wp-admin/js/post.js

@@ -261 +261 @@
         }
         });
+
+        // preview
+        $('#post-preview').click(function(e){
+                $('input#wp-preview').val('dopreview');
+                $('form#post').attr('target', 'wp-preview').submit().attr('target', '');
+                $('input#wp-preview').val('');
+        });
+
 });
 
@@ -315 +323 @@
                         return false;
                 }
-        }
-
+        };
+        
 })(jQuery);
 

trunk/wp-admin/page.php

@@ -68 +68 @@
 }
 
-if (isset($_POST['deletepost'])) {
-$action = "delete";
-}
+if (isset($_POST['deletepost']))
+        $action = "delete";
+elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+        $action = 'preview';
 
 switch($action) {
@@ -173 +174 @@
         break;
 
+case 'preview':
+        check_admin_referer( 'autosave', 'autosavenonce' );
+
+        if ( empty($_POST['post_title']) )
+                wp_die( __('Please enter a title before previewing this page.') );
+
+        $id = post_preview();
+
+        if ( is_wp_error($id) )
+                wp_die( $id->get_error_message() );
+
+        if ( $_POST['post_status'] == 'publish'  ) {
+                $nonce = wp_create_nonce('post_preview_' . $id);
+                $url = site_url('?wp_preview=' . $id . '&preview_nonce=' . $nonce);
+        } else {
+                $url = site_url('?page_id=' . $id . '&preview=true');
+        }
+
+        wp_redirect($url);
+        exit();
+        break;
+
 default:
         wp_redirect('edit-pages.php');

trunk/wp-admin/post.php

@@ -81 +81 @@
 if ( isset( $_POST['deletepost'] ) )
         $action = 'delete';
+elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+        $action = 'preview';
 
 switch($action) {
@@ -219 +221 @@
         break;
 
+case 'preview':
+        check_admin_referer( 'autosave', 'autosavenonce' );
+
+        if ( empty($_POST['post_title']) )
+                wp_die( __('Please enter a title before previewing this post.') );
+
+        $id = post_preview();
+
+        if ( is_wp_error($id) )
+                wp_die( $id->get_error_message() );
+
+        if ( $_POST['post_status'] == 'publish'  ) {
+                $nonce = wp_create_nonce('post_preview_' . $id);
+                $url = site_url('?wp_preview=' . $id . '&preview_nonce=' . $nonce);
+        } else {
+                $url = site_url('?p=' . $id . '&preview=true');
+        }
+
+        wp_redirect($url);
+        exit();
+        break;
+
 default:
         wp_redirect('edit.php');

trunk/wp-includes/default-filters.php

@@ -198 +198 @@
 add_action('edit_form_advanced', 'wp_remember_old_slug');
 add_action('init', 'wp_user_settings', 9);
+add_action('init', '_show_post_preview');
 
 ?>

trunk/wp-includes/post.php

@@ -3552 +3552 @@
         return $revisions;
 }
+
+function _show_post_preview() {
+
+        if ( isset($_GET['wp_preview']) && isset($_GET['preview_nonce']) ) {
+                $post_ID = (int) $_GET['wp_preview'];
+
+                if ( false == wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $post_ID ) )
+                        wp_die( __('You do not have permission to preview drafts.') );
+
+                $q = array(
+                        'name' => "{$post_ID}-autosave",
+                        'post_parent' => $post_ID,
+                        'post_type' => 'revision',
+                        'post_status' => 'inherit'
+                );
+
+                add_action( 'parse_query', '_wp_get_post_autosave_hack' );
+                query_posts($q);
+                remove_action( 'parse_query', '_wp_get_post_autosave_hack' );
+
+        }
+}

trunk/wp-includes/script-loader.php

@@ -177 +177 @@
                         'cancel' => __('Cancel'),
                 ) );
-                $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081018' );
+                $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081031' );
                 $scripts->localize( 'post', 'postL10n', array(
                         'tagsUsed' =>  __('Tags used on this post:'),
@@ -196 +196 @@
                         'saveDraft' => __('Save Draft')
                 ) );
-                $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox', 'settings-box'), '20080925' );
+                $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox', 'settings-box'), '20081031' );
                 $scripts->localize( 'page', 'postL10n', array(
                         'cancel' => __('Cancel'),