From 6bae3a6edac2aa3f75a04bfb7ca667fa985a5cbb Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Thu, 4 Apr 2013 16:03:21 +0000 Subject: [PATCH] A little more revisions js/php cleanup. see #23901. props kovshenin, ocean90. git-svn-id: https://develop.svn.wordpress.org/trunk@23904 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/ajax-actions.php | 10 +++++++--- wp-admin/js/revisions.js | 9 +++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 4878e4ad41..5e8f670325 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -2186,6 +2186,7 @@ function wp_ajax_revisions_data() { continue; $revision_from_date_author = ''; + $is_current_revision = false; $count++; // return blank data for diffs to the left of the left handle (for right handel model) // or to the right of the right handle (for left handel model) @@ -2235,10 +2236,12 @@ function wp_ajax_revisions_data() { elseif ( wp_is_post_autosave( $left_revision ) ) $revision_from_date_author = sprintf( $autosavef, $revision_from_date_author ); - if ( $revision->post_modified === $post->post_modified ) + if ( $revision->post_modified === $post->post_modified ) { $revision_date_author = sprintf( $currentf, $revision_date_author ); - elseif ( wp_is_post_autosave( $revision ) ) + $is_current_revision = true; + } elseif ( wp_is_post_autosave( $revision ) ) { $revision_date_author = sprintf( $autosavef, $revision_date_author ); + } /* translators: revision date short format, see http://php.net/date */ $date_short_format = _x( 'j M @ G:i', 'revision date short format'); @@ -2275,7 +2278,8 @@ function wp_ajax_revisions_data() { 'titleTooltip' => $revision_date_author_short, 'restoreLink' => urldecode( $restore_link ), 'revision_toload' => true, - 'previous_revision_id' => $previous_revision_id + 'previous_revision_id' => $previous_revision_id, + 'is_current_revision' => $is_current_revision, ); } $previous_revision_id = $revision->ID; diff --git a/wp-admin/js/revisions.js b/wp-admin/js/revisions.js index 8f15c01fbf..f1149f0469 100644 --- a/wp-admin/js/revisions.js +++ b/wp-admin/js/revisions.js @@ -633,11 +633,7 @@ window.wp = window.wp || {}; this.toogleCompareTwoCheckbox(); // hide the restore button when on the last sport/current post data - if ( Diff.rightDiff === Diff.revisions.length ){ - $( '#restore-revision' ).hide(); - } else { - $( '#restore-revision' ).show(); - } + $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'is_current_revision' ) ); return this; }, @@ -703,7 +699,8 @@ window.wp = window.wp || {}; lines_added: 0, lines_deleted: 0, scope_of_changes: 'none', - previous_revision_id: 0 + previous_revision_id: 0, + is_current_revision: false }, url: function() {