Skip to content

Commit 5276f77

Browse files
authored
Merge pull request #2 from maxxer/fix_titles
Handle side by side title customization
2 parents 14b612c + d620b8c commit 5276f77

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

example/example.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232

3333
// Generate a side by side diff
3434
require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/SideBySide.php';
35-
$renderer = new Diff_Renderer_Html_SideBySide;
35+
$renderer = new Diff_Renderer_Html_SideBySide(array(
36+
'title_a' => 'Custom title for OLD version',
37+
'title_b' => 'Custom title for NEW version',
38+
));
3639
echo $diff->Render($renderer);
3740

3841
?>

lib/Diff.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ class Diff
6868
'ignoreNewLines' => false,
6969
'ignoreWhitespace' => false,
7070
'ignoreCase' => false,
71-
'title_a'=>'Old Version',
72-
'title_b'=>'New Version',
7371
'labelDifferences'=>'Differences'
7472
);
7573

lib/Diff/Renderer/Abstract.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ abstract class Diff_Renderer_Abstract
5050
/**
5151
* @var array Array of the default options that apply to this renderer.
5252
*/
53-
protected $defaultOptions = array();
53+
protected $defaultOptions = array(
54+
'title_a' => 'Old Version',
55+
'title_b' => 'New Version',
56+
);
5457

5558
/**
5659
* @var array Array containing the user applied and merged default options for the renderer.

lib/Diff/Renderer/Html/Array.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ class Diff_Renderer_Html_Array extends Diff_Renderer_Abstract
5151
* @var array Array of the default options that apply to this renderer.
5252
*/
5353
protected $defaultOptions = array(
54-
'tabSize' => 4
54+
'tabSize' => 4,
55+
'title_a' => 'Old Version',
56+
'title_b' => 'New Version',
5557
);
5658

5759
/**

lib/Diff/Renderer/Html/SideBySide.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public function render()
6565
$html .= '<table class="Differences DifferencesSideBySide">';
6666
$html .= '<thead>';
6767
$html .= '<tr>';
68-
$html .= '<th colspan="2">Old Version</th>';
69-
$html .= '<th colspan="2">New Version</th>';
68+
$html .= '<th colspan="2">'.$this->options['title_a'].'</th>';
69+
$html .= '<th colspan="2">'.$this->options['title_b'].'</th>';
7070
$html .= '</tr>';
7171
$html .= '</thead>';
7272
foreach($changes as $i => $blocks) {

0 commit comments

Comments
 (0)