Changeset 9473

Timestamp:

11/02/2008 01:56:32 PM (16 years ago)

Author:

azaozz

Message:

Preview fixes: ensure autosave is run at least once on new posts before preview, properly show previews for pending and scheduled posts.

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/js/page.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/page.php (modified) (2 diffs)
• wp-admin/post.php (modified) (2 diffs)
• wp-includes/js/autosave.js (modified) (7 diffs)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/includes/post.php

@@ -1003 +1003 @@
 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']))
+    $post_ID = (int) $_POST['post_ID'];
+    if ( $post_ID < 1 )
+        wp_die( __('Preview not available. Please save as draft first.') );
+    
+    if ( isset($_POST['catslist']) )
+        $_POST['post_category'] = explode(",", $_POST['catslist']);
+    
+    if ( isset($_POST['tags_input']) )
+        $_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();
+    $_POST['ID'] = $post_ID;
+    $post = get_post($post_ID);
+
+    if ( 'page' == $post->post_type ) {
+        if ( !current_user_can('edit_page', $post_ID) )
+            wp_die(__('You are not allowed to edit this page.'));
     } 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 );
+        if ( !current_user_can('edit_post', $post_ID) )
+            wp_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.
+        $id = wp_create_post_autosave( $post->ID );
+        if ( ! is_wp_error($id) )
             $id = $post->ID;
-        }
     }
 

trunk/wp-admin/js/page.js

@@ -109 +109 @@
     // preview
     $('#post-preview').click(function(e){
+        if ( 1 > $('#post_ID').val() && autosaveFirst ) {
+            autosaveDelayPreview = true;
+            autosave();
+            return false;
+        }
+
         $('input#wp-preview').val('dopreview');
         $('form#post').attr('target', 'wp-preview').submit().attr('target', '');
         $('input#wp-preview').val('');
+        return false;
     });
 });

trunk/wp-admin/js/post.js

@@ -264 +264 @@
     // preview
     $('#post-preview').click(function(e){
+        if ( 1 > $('#post_ID').val() && autosaveFirst ) {
+            autosaveDelayPreview = true;
+            autosave();
+            return false;
+        }
+
         $('input#wp-preview').val('dopreview');
         $('form#post').attr('target', 'wp-preview').submit().attr('target', '');
         $('input#wp-preview').val('');
+        return false;
     });
 

trunk/wp-admin/page.php

@@ -177 +177 @@
     check_admin_referer( 'autosave', 'autosavenonce' );
 
-    if ( empty($_POST['post_title']) )
-        wp_die( __('Please enter a title before previewing this page.') );
-
     $id = post_preview();
 
@@ -185 +182 @@
         wp_die( $id->get_error_message() );
 
-    if ( $_POST['post_status'] == 'publish'  ) {
+    if ( $_POST['post_status'] == 'draft'  ) {
+        $url = get_option('home') . '/?page_id=' . $id . '&preview=true';
+    } else {
         $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');
+        $url = get_option('home') . '/?wp_preview=' . $id . '&preview_nonce=' . $nonce;
     }
 

trunk/wp-admin/post.php

@@ -224 +224 @@
     check_admin_referer( 'autosave', 'autosavenonce' );
 
-    if ( empty($_POST['post_title']) )
-        wp_die( __('Please enter a title before previewing this post.') );
-
     $id = post_preview();
 
@@ -232 +229 @@
         wp_die( $id->get_error_message() );
 
-    if ( $_POST['post_status'] == 'publish'  ) {
+    if ( $_POST['post_status'] == 'draft'  ) {
+        $url = get_option('home') . '/?p=' . $id . '&preview=true';
+    } else {
         $nonce = wp_create_nonce('post_preview_' . $id);
         $url = get_option('home') . '/?wp_preview=' . $id . '&preview_nonce=' . $nonce;
-    } else {
-        $url = get_option('home') . '/?p=' . $id . '&preview=true';
     }
 

trunk/wp-includes/js/autosave.js

@@ -2 +2 @@
 var autosavePeriodical;
 var autosaveOldMessage = '';
-var autosaveDelayURL = null;
-var previewwin;
+var autosaveDelayPreview = false;
+var autosaveFirst = true;
 
 jQuery(function($) {
@@ -11 +11 @@
     //Disable autosave after the form has been submitted
     $("#post").submit(function() { $.cancel(autosavePeriodical); });
-
-    // Autosave when the preview button is clicked.
-    $('#previewview a').click(function(e) {
-        autosave();
-        autosaveDelayURL = this.href;
-        previewwin = window.open('','_blank');
-
-        e.preventDefault();
-        return false;
-    });
 });
 
@@ -42 +32 @@
         }
 
-        // if no errors: add preview link and slug UI
+        // if no errors: add slug UI
         if ( !res.errors ) {
             var postID = parseInt( res.responses[0].id );
             if ( !isNaN(postID) && postID > 0 ) {
-                autosave_update_preview_link(postID);
                 autosave_update_slug(postID);
             }
@@ -70 +59 @@
         var postID = parseInt( res.responses[0].id );
         autosave_update_post_ID( postID ); // disabled form buttons are re-enabled here
-        if ( tempID < 0 && postID > 0) // update media buttons
+        if ( tempID < 0 && postID > 0 ) // update media buttons
             jQuery('#media-buttons a').each(function(){
                 this.href = this.href.replace(tempID, postID);
             });
+        // activate preview
+        autosaveFirst = false;
+        if ( autosaveDelayPreview )
+            jQuery('#post-preview').click();
     } else {
         autosave_enable_buttons(); // re-enable disabled form buttons
@@ -98 +91 @@
 }
 
-function autosave_update_preview_link(post_id) {
-    // Add preview button if not already there
-    if ( !jQuery('#previewview > *').size() ) {
-        var post_type = jQuery('#post_type').val();
-        var previewText = 'page' == post_type ? autosaveL10n.previewPageText : autosaveL10n.previewPostText;
-        jQuery.post(autosaveL10n.requestFile, {
-            action: "get-permalink",
-            post_id: post_id,
-            getpermalinknonce: jQuery('#getpermalinknonce').val()
-        }, function(permalink) {
-            jQuery('#previewview').html('<a class="button" target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
-
-            // Autosave when the preview button is clicked.
-            jQuery('#previewview a').click(function(e) {
-                autosave();
-                autosaveDelayURL = this.href;
-                previewwin = window.open('','_blank');
-
-                e.preventDefault();
-                return false;
-            });
-        });
-    }
-}
-
 function autosave_update_slug(post_id) {
     // create slug area only if not already there
@@ -148 +116 @@
 function autosave_enable_buttons() {
     jQuery("#submitpost :button:disabled, #submitpost :submit:disabled").attr('disabled', '');
-    if ( autosaveDelayURL ) {
-        previewwin.location = autosaveDelayURL;
-        autosaveDelayURL = null;
-    }
 }
 
@@ -224 +188 @@
     if(parseInt(post_data["post_ID"]) < 1) {
         post_data["temp_ID"] = post_data["post_ID"];
-        var successCallback = autosave_saved_new;; // new post
+        var successCallback = autosave_saved_new; // new post
     } else {
         var successCallback = autosave_saved; // pre-existing post

trunk/wp-includes/script-loader.php

@@ -76 +76 @@
     ) );
 
-    $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080701' );
+    $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20081102' );
 
     $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080729' );
@@ -177 +177 @@
             'cancel' => __('Cancel'),
         ) );
-        $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081031' );
+        $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081102' );
         $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'), '20081031' );
+        $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox', 'settings-box'), '20081102' );
         $scripts->localize( 'page', 'postL10n', array(
             'cancel' => __('Cancel'),