*/
var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
+ /**
+ * 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.
*
*/
function __construct( $params = array() ) {
parent::__construct( $params );
+ if ( isset( $params[ 'show_split_view' ] ) )
+ $this->_show_split_view = $params[ 'show_split_view' ];
}
/**
* @return string
*/
function addedLine( $line ) {
- return "<td>+</td><td class='diff-addedline'>{$line}</td>";
+ return "<td class='diff-addedline'>{$line}</td>";
+
}
/**
* @return string
*/
function deletedLine( $line ) {
- return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
+ return "<td class='diff-deletedline'>{$line}</td>";
}
/**
* @return string
*/
function contextLine( $line ) {
- return "<td> </td><td class='diff-context'>{$line}</td>";
+ return "<td class='diff-context'>{$line}</td>";
}
/**
* @return string
*/
function emptyLine() {
- return '<td colspan="2"> </td>';
+ return '<td> </td>';
}
/**
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '<tr>' . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+ 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;
}
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . "</tr>\n";
+ 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;
}
foreach ($lines as $line) {
if ( $encode )
$line = htmlspecialchars( $line );
- $r .= '<tr>' .
- $this->contextLine( $line ) . $this->contextLine( $line ) . "</tr>\n";
+ 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;
}
} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
$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";
+ }
}
}
$chars2 = count_chars($string2);
// L1-norm of difference vector.
- $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
+ $difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
// $string1 has zero length? Odd. Give huge penalty by not dividing.
if ( !$string1 )