Changeset 50034

Timestamp:

01/27/2021 09:52:10 PM (4 years ago)

Author:

joedolson

Message:

Revisions: Generate correct number of columns in wp_text_diff.

The function wp_text_diff generated an invalid table structure if the $args parameter contained any values. This patch corrects the structure generated by wp_text_diff and related usages so that the column count matches the data generated. Additionally, this patch passes arguments to the Revisions screen so that the screen has column headings that reflect the content in each column. Improves the accessibility and usability of the Revisions table.

Props joedolson, mehulkaklotar, afercia, adamsilverstein, zodiac1978, jeremyfelt
Fixes #25473

Location:

trunk/src

Files:

• wp-admin/includes/revision.php (modified) (1 diff)
• wp-includes/class-wp-text-diff-renderer-table.php (modified) (4 diffs)
• wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-admin/includes/revision.php

@@ -87 +87 @@
         $args = array(
             'show_split_view' => true,
+            'title_left'      => __( 'Removed' ),
+            'title_right'     => __( 'Added' ),
         );
 

trunk/src/wp-includes/class-wp-text-diff-renderer-table.php

@@ -177 +177 @@
 
             if ( $this->_show_split_view ) {
-                $r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+                $r .= '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
             } else {
                 $r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
@@ -202 +202 @@
             }
             if ( $this->_show_split_view ) {
-                $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+                $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . "</tr>\n";
             } else {
                 $r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
@@ -227 +227 @@
             }
             if ( $this->_show_split_view ) {
-                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n";
+                $r .= '<tr>' . $this->contextLine( $line ) . $this->contextLine( $line ) . "</tr>\n";
             } else {
                 $r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
@@ -320 +320 @@
             } else { // A true changed row.
                 if ( $this->_show_split_view ) {
-                    $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+                    $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
                 } else {
                     $r .= '<tr>' . $this->deletedLine( $orig_line ) . '</tr><tr>' . $this->addedLine( $final_line ) . "</tr>\n";

trunk/src/wp-includes/pluggable.php

@@ -2839 +2839 @@
         }
 
-        $r = "<table class='diff'>\n";
-
-        if ( ! empty( $args['show_split_view'] ) ) {
-            $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
-        } else {
-            $r .= "<col class='content' />";
-        }
-
-        if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+        $is_split_view       = ! empty( $args['show_split_view'] );
+        $is_split_view_class = $is_split_view ? ' is-split-view' : '';
+
+        $r = "<table class='diff$is_split_view_class'>\n";
+
+        if ( $args['title'] ) {
+            $r .= "<caption class='diff-title'>$args[title]</caption>\n";
+        }
+
+        if ( $args['title_left'] || $args['title_right'] ) {
             $r .= '<thead>';
         }
-        if ( $args['title'] ) {
-            $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
-        }
+
         if ( $args['title_left'] || $args['title_right'] ) {
+            $th_or_td_left  = empty( $args['title_left'] ) ? 'td' : 'th';
+            $th_or_td_right = empty( $args['title_right'] ) ? 'td' : 'th';
+
             $r .= "<tr class='diff-sub-title'>\n";
-            $r .= "\t<td></td><th>$args[title_left]</th>\n";
-            $r .= "\t<td></td><th>$args[title_right]</th>\n";
+            $r .= "\t<$th_or_td_left>$args[title_left]</$th_or_td_left>\n";
+            if ( $is_split_view ) {
+                $r .= "\t<$th_or_td_right>$args[title_right]</$th_or_td_right>\n";
+            }
             $r .= "</tr>\n";
         }
-        if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+
+        if ( $args['title_left'] || $args['title_right'] ) {
             $r .= "</thead>\n";
         }