sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A little more revisions js/php cleanup. see #23901. props kovshenin, ocean90.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@23904 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2013-04-04 16:03:21 +00:00
parent a4bf14e7da
commit 6bae3a6eda
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/ajax-actions.php
View File

@ -2186,6 +2186,7 @@ function wp_ajax_revisions_data() {
continue; continue;
$revision_from_date_author = ''; $revision_from_date_author = '';
$is_current_revision = false;
$count++; $count++;
// return blank data for diffs to the left of the left handle (for right handel model) // 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) // 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 ) ) elseif ( wp_is_post_autosave( $left_revision ) )
$revision_from_date_author = sprintf( $autosavef, $revision_from_date_author ); $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 ); $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 ); $revision_date_author = sprintf( $autosavef, $revision_date_author );
}
/* translators: revision date short format, see http://php.net/date */ /* translators: revision date short format, see http://php.net/date */
$date_short_format = _x( 'j M @ G:i', 'revision date short format'); $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, 'titleTooltip' => $revision_date_author_short,
'restoreLink' => urldecode( $restore_link ), 'restoreLink' => urldecode( $restore_link ),
'revision_toload' => true, '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; $previous_revision_id = $revision->ID;

9
wp-admin/js/revisions.js
View File

@ -633,11 +633,7 @@ window.wp = window.wp || {};
this.toogleCompareTwoCheckbox(); this.toogleCompareTwoCheckbox();
// hide the restore button when on the last sport/current post data // hide the restore button when on the last sport/current post data
if ( Diff.rightDiff === Diff.revisions.length ){ $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'is_current_revision' ) );
$( '#restore-revision' ).hide();
} else {
$( '#restore-revision' ).show();
}
return this; return this;
}, },
@ -703,7 +699,8 @@ window.wp = window.wp || {};
lines_added: 0, lines_added: 0,
lines_deleted: 0, lines_deleted: 0,
scope_of_changes: 'none', scope_of_changes: 'none',
previous_revision_id: 0 previous_revision_id: 0,
is_current_revision: false
}, },
url: function() { url: function() {