Changeset 23506 for trunk/wp-includes/wp-diff.php

Timestamp:

02/28/2013 03:14:34 PM (14 years ago)

Author:

westi

Message:

Revisions: First pass an implementing a new UI/UX for reviewing the revisions of posts. See #23497 props adamsilverstein for the initial patch.

This implements a new revisions ui using Backbone and preserves all the old methods of "integration" so the change should be transparent to plugins using revisi
ons with CPTs.

This is the first pass and so there are a number of things still to be resolved, more details in the ticket. Feedback welcomed.

File:

• trunk/wp-includes/wp-diff.php (modified) (10 diffs)

trunk/wp-includes/wp-diff.php

@@ -61 +61 @@
 
         /**
+         * Should we show the split view or not
+         *
+         * @var string
+         * @access protected
+         * @since 3.6.0
+         */
+        var $_show_split_view = true;
+
+        /**
          * Constructor - Call parent constructor with params array.
          *
@@ -71 +80 @@
         function __construct( $params = array() ) {
                 parent::__construct( $params );
+                if ( isset( $params[ 'show_split_view' ] ) )
+                        $this->_show_split_view = $params[ 'show_split_view' ];
         }
 
@@ -99 +110 @@
          */
         function addedLine( $line ) {
-                return "<td>+</td><td class='diff-addedline'>{$line}</td>";
+                return "<td class='diff-addedline'>{$line}</td>";
+
         }
 
@@ -109 +121 @@
          */
         function deletedLine( $line ) {
-                return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
+                return "<td class='diff-deletedline'>{$line}</td>";
         }
 
@@ -119 +131 @@
          */
         function contextLine( $line ) {
-                return "<td> </td><td class='diff-context'>{$line}</td>";
+                return "<td class='diff-context'>{$line}</td>";
         }
 
@@ -128 +140 @@
          */
         function emptyLine() {
-                return '<td colspan="2">&nbsp;</td>';
+                return '<td>&nbsp;</td>';
         }
 
@@ -143 +155 @@
                 foreach ($lines as $line) {
                         if ( $encode )
-                                $line = htmlspecialchars( $line );
-                        $r .= '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+                                $line = wp_kses_post( $line );
+                        if ( $this->_show_split_view ) {
+                                $r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+                        } else {
+                                $r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
+                        }
                 }
                 return $r;
@@ -161 +177 @@
                 foreach ($lines as $line) {
                         if ( $encode )
-                                $line = htmlspecialchars( $line );
-                        $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . "</tr>\n";
+                                $line = wp_kses_post( $line );
+                        if ( $this->_show_split_view ) {
+                                $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+                        } else {
+                                $r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
+                        }
+
                 }
                 return $r;
@@ -179 +200 @@
                 foreach ($lines as $line) {
                         if ( $encode )
-                                $line = htmlspecialchars( $line );
-                        $r .= '<tr>' .
-                                $this->contextLine( $line ) . $this->contextLine( $line ) . "</tr>\n";
+                                $line = wp_kses_post( $line );
+                        if (  $this->_show_split_view ) {
+                                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+                        } else {
+                                $r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
+                        }
                 }
                 return $r;
@@ -265 +289 @@
                                 $r .= $this->_deleted( array($orig_line), false );
                         } else { // A true changed row.
-                                $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
+                                if ( $this->_show_split_view ) {
+                                        $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+                                } else {
+                                        $r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+                                }
                         }
                 }