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

Timestamp:

05/08/2013 09:22:01 PM (12 years ago)

Author:

ocean90

Message:

Revisions UI: RTL support. (And inline docs.)

props DrewAPicture, adamsilverstein. fixes #23897.

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (7 diffs)

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

@@ -2120 +2120 @@
     $compare_two_mode = (bool) $post_id;
 
-    //
-    //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
-    //
     $all_the_revisions = array();
     if ( ! $post_id )
@@ -2137 +2132 @@
     $left_revision = get_post( $compare_to );
 
-    //single model fetch mode
-    //return the diff of a single revision comparison
+    // single model fetch mode
+    // return the diff of a single revision comparison
     if ( $single_revision_id ) {
         $right_revision = get_post( $single_revision_id );
@@ -2154 +2149 @@
         $lines_added = $lines_deleted = 0;
         $content = '';
-        //compare from left to right, passed from application
+        // compare from left to right, passed from application
         foreach ( _wp_post_revision_fields() as $field => $field_value ) {
             $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field, $left_revision, 'left' );
@@ -2183 +2178 @@
 
         $all_the_revisions = array (
-            'diff'          => $content,
+            'diff'         => $content,
             'linesDeleted' => $lines_deleted,
             'linesAdded'   => $lines_added
@@ -2190 +2185 @@
         echo json_encode( $all_the_revisions );
         exit();
-    } //end single model fetch
+    } // end single model fetch
 
     $count = -1;
 
-    //reverse the list to start with oldes revision
+    // reverse the list to start with oldest revision
     $revisions = array_reverse( $revisions );
 
@@ -2209 +2204 @@
         $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)
-        if ( ( 0 != $left_handle_at && $count < $left_handle_at ) ||
-             ( 0 != $right_handle_at && $count > ( $right_handle_at - 2 ) ) ) {
-            $all_the_revisions[] = array (
-                'ID' => $revision->ID,
-            );
-            continue;
+
+        /**
+        * 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)
+        * and visa versa in RTL mode
+        */
+        if( ! is_rtl() ) {
+            if ( ( ( 0 != $left_handle_at && $count < $left_handle_at ) ||
+                 ( 0 != $right_handle_at && $count > ( $right_handle_at - 2 ) ) ) ) {
+                $all_the_revisions[] = array (
+                    'ID' => $revision->ID,
+                );
+                continue;
+            }
+        } else { // is_rtl
+            if ( ( 0 != $left_handle_at && $count > ( $left_handle_at - 1 ) ||
+                 ( 0 != $left_handle_at && $count < $right_handle_at ) ) ) {
+                $all_the_revisions[] = array (
+                    'ID' => $revision->ID,
+                );
+                continue;
+            }
         }
 
@@ -2308 +2317 @@
     endforeach;
 
+    // in RTL + single handle mode, reverse the revision direction
+    if ( is_rtl() && $compare_two_mode )
+        $all_the_revisions = array_reverse( $all_the_revisions );
+
     echo json_encode( $all_the_revisions );
     exit();