Changeset 23639 for trunk/wp-admin/includes/ajax-actions.php

Timestamp:

03/07/2013 03:32:26 PM (12 years ago)

Author:

westi

Message:

Revisions: Updates to the new Revisions UI.

Various Updates including:

• i18n fixes
• Added tracking of what revision ID was restored
• async fetching of diffs so that slider works sooner even with many revisions

See #23497 props adamsilverstein, ethitter

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -2132 +2132 @@
     check_ajax_referer( 'revisions-ajax-nonce', 'nonce' );
 
-    $compareto = isset( $_GET['compareto'] ) ? absint( $_GET['compareto'] ) : 0;
-    $showautosaves = isset( $_GET['showautosaves'] ) ? $_GET['showautosaves'] : '';
-    $showsplitview = isset( $_GET['showsplitview'] ) ? $_GET['showsplitview'] : '';
-    $postid = isset( $_GET['post_id'] ) ? absint( $_GET['post_id'] ) : '';
-
-    $comparetwomode = ( '' == $postid ) ? false : true;
+    $compare_to = isset( $_GET['compare_to'] ) ? absint( $_GET['compare_to'] ) : 0;
+    $show_autosaves = isset( $_GET['show_autosaves'] ) ? $_GET['show_autosaves'] : '';
+    $show_split_view = isset( $_GET['show_split_view'] ) ? $_GET['show_split_view'] : '';
+    $post_id = isset( $_GET['post_id'] ) ? absint( $_GET['post_id'] ) : '';
+    $right_handle_at = isset( $_GET['right_handle_at'] ) ? $_GET['right_handle_at'] : 0;
+    $left_handle_at = isset( $_GET['left_handle_at'] ) ? $_GET['left_handle_at'] : 0;
+    $single_revision_id = isset( $_GET['single_revision_id'] ) ? $_GET['single_revision_id'] : 0;
+
+    $compare_two_mode = ( '' == $post_id ) ? false : true;
     //
-    //TODO: currently code returns all possible comparisons for the indicated 'compareto' revision
+    //TODO: currently code returns all possible comparisons for the indicated 'compare_to' revision
     //however, the front end prevents users from pulling the right handle past the left or the left pass the right,
     //so only the possible diffs need be generated
     //
     $alltherevisions = array();
-    if ( '' == $postid )
-        $postid = $compareto;
-
-    if ( ! current_user_can( 'read_post', $postid ) )
+    if ( '' == $post_id )
+        $post_id = $compare_to;
+
+    if ( ! current_user_can( 'read_post', $post_id ) )
         continue;
 
-    if ( ! $revisions = wp_get_post_revisions( $postid ) )
+    if ( ! $revisions = wp_get_post_revisions( $post_id ) )
         return;
 
+    /* translators: revision date format, see http://php.net/date */
+    $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+
+    //single model fetch mode
+    if ( 0 != $single_revision_id ) {
+        $left_revision = get_post( $compare_to );
+        $right_revision = get_post( $single_revision_id );
+
+        if ( $compare_two_mode ) {
+            $compare_to_gravatar = get_avatar( $left_revision->post_author, 18 );
+            $compare_to_author = get_the_author_meta( 'display_name', $left_revision->post_author );
+            $compare_to_date = date_i18n( $datef, strtotime( $left_revision->post_modified ) );
+
+            $revision_from_date_author = sprintf(
+                '%s %s, %s %s (%s)',
+                $compare_to_gravatar,
+                $compare_to_author,
+                human_time_diff( strtotime( $left_revision->post_modified ), current_time( 'timestamp' ) ),
+                __( ' ago ' ),
+                $compare_to_date
+            );
+        }
+
+        //
+        //make sure the left revision is the most recent
+        //
+        if ( strtotime( $right_revision->post_modified_gmt ) < strtotime( $left_revision->post_modified_gmt ) ) {
+            $temp = $left_revision;
+            $left_revision = $right_revision;
+            $right_revision = $temp;
+        }
+
+        //
+        //compare from left to right, passed from application
+        //
+        $content='';
+        foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
+            $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field, $left_revision, 'left' );
+            $right_content = apply_filters( "_wp_post_revision_field_$field", $right_revision->$field, $field, $right_revision, 'right' );
+
+            add_filter( "_wp_post_revision_field_$field", 'wp_kses_post' );
+
+            $args = array();
+
+            if ( ! empty( $show_split_view ) )
+                 $args = array( 'show_split_view' => true );
+
+            $content .= wp_text_diff( $left_content, $right_content, $args );
+        }
+            $content = '' == $content ? __( 'No difference' ) : $content;
+            $alltherevisions = array (
+                'revisiondiff' => $content
+            );
+        echo json_encode( $alltherevisions );
+        exit();
+    }
 
     //if we are comparing two revisions, the first 'revision' represented by the leftmost
     //slider position is the current revision, prepend a comparison to this revision
-    if ( $comparetwomode )
-        array_unshift( $revisions, get_post( $postid ) );
-
-    $count = 1;
+    if ( $compare_two_mode ) 
+        array_unshift( $revisions, get_post( $post_id ) );
+        
+    $count = -1;
+
     foreach ( $revisions as $revision ) :
-    if ( 'true' != $showautosaves && wp_is_post_autosave( $revision ) )
+        if ( ! empty( $show_autosaves ) && wp_is_post_autosave( $revision ) )
+                continue;
+
+        $revision_from_date_author = '';
+        $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)
+        if ( ( 0 != $left_handle_at && $count <= $left_handle_at ) || 
+             ( 0 != $right_handle_at && $count > $right_handle_at )) { 
+            $alltherevisions[] = array (
+                'ID' => $revision->ID,
+            );
+            
             continue;
-
-    $revision_from_date_author = '';
-
-
-    $left_revision = get_post( $compareto );
-    $right_revision = get_post( $revision );
-
-    $author = get_the_author_meta( 'display_name', $revision->post_author );
-    /* translators: revision date format, see http://php.net/date */
-    $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
-
-    $gravatar = get_avatar( $revision->post_author, 18 );
-
-    $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-    $revision_date_author = sprintf(
-        '%s %s, %s %s (%s)',
-        $gravatar,
-        $author,
-        human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
-        __( ' ago ' ),
-        $date
-    );
-
-    if ( $comparetwomode ) {
-        $compareto_gravatar = get_avatar( $left_revision->post_author, 18 );
-        $compareto_author = get_the_author_meta( 'display_name', $left_revision->post_author );
-        $compareto_date = date_i18n( $datef, strtotime( $left_revision->post_modified ) );
-
-        $revision_from_date_author = sprintf(
+        }
+
+        $gravatar = get_avatar( $revision->post_author, 18 );
+        $author = get_the_author_meta( 'display_name', $revision->post_author );
+        $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
+        $revision_date_author = sprintf(
             '%s %s, %s %s (%s)',
-            $compareto_gravatar,
-            $compareto_author,
-            human_time_diff( strtotime( $left_revision->post_modified ), current_time( 'timestamp' ) ),
+            $gravatar,
+            $author,
+            human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
             __( ' ago ' ),
-            $compareto_date
+            $date
         );
-    }
-
-    $restoreaction = wp_nonce_url(
-        add_query_arg(
-            array( 'revision' => $revision->ID,
-                'action' => 'restore' ),
-                '/wp-admin/revision.php'
-        ),
-        "restore-post_{$compareto}|{$revision->ID}"
-    );
-
-    //
-    //make sure the left revision is the most recent
-    //
-    if ( strtotime( $right_revision->post_modified_gmt ) < strtotime( $left_revision->post_modified_gmt ) ) {
-        $temp = $left_revision;
-        $left_revision = $right_revision;
-        $right_revision = $temp;
-    }
-
-    //
-    //compare from left to right, passed from application
-    //
-    $content='';
-    foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
-        $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field, $left_revision, 'left' );
-        $right_content = apply_filters( "_wp_post_revision_field_$field", $right_revision->$field, $field, $right_revision, 'right' );
-
-        add_filter( "_wp_post_revision_field_$field", 'wp_kses_post' );
-
-        $args = array();
-
-        if ( 'true' == $showsplitview )
-             $args = array( 'showsplitview' => 'true' );
-
-        $content .= wp_text_diff( $left_content, $right_content, $args );
-    }
-
-    //if we are comparing two revisions
-    //and we are on the matching revision
-    //add an error revision indicating unable to compare to self
-    if ( $comparetwomode && $compareto == $revision->ID )
+
+        $restoreaction = wp_nonce_url(
+            add_query_arg(
+                array( 'revision' => $revision->ID,
+                    'action' => 'restore' ),
+                    admin_url( 'revision.php' )
+            ),
+            "restore-post_{$compare_to}|{$revision->ID}"
+        );
+
         $alltherevisions[] = array (
-            'ID' => $revision->ID,
-            'revision_date_author' => $revision_date_author,
-            'revisiondiff' => sprintf('<div id="selfcomparisonerror">%s</div>', __( 'Cannot compare revision to itself' ) ),
-            'restoreaction' => urldecode( $restoreaction ),
-            'revision_from_date_author' => ''
-        );
-
-    //add to the return data only if there is a difference
-    if ( '' != $content )
-        $alltherevisions[] = array (
-            'ID' => $revision->ID,
-            'revision_date_author' => $revision_date_author,
-            'revisiondiff' => $content,
-            'restoreaction' => urldecode( $restoreaction ),
-            'revision_from_date_author' => $revision_from_date_author
-        );
+                'ID' => $revision->ID,
+                'revision_date_author' => $revision_date_author,
+                'revision_from_date_author' => $revision_from_date_author,
+                'restoreaction' => urldecode( $restoreaction ),
+                'revision_toload' => true
+            );
 
     endforeach;