Skip to content

Commit 1ba255f

Browse files
committed
Cut HTML Unified Renderer
1 parent 532bd4a commit 1ba255f

File tree

9 files changed

+1
-353
lines changed

9 files changed

+1
-353
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ directory. Included is a light and a dark theme.
9898

9999
![HTML Inline Example](assets/htmlInline.png "HTML Inline Example")
100100

101-
#### HTML Unified Example
102-
103-
![HTML Unified Example](assets/htmlUnified.png "HTML Unified Example")
104-
105101
#### Text Unified Example
106102

107103
![Text Unified Example](assets/textUnified.png "Text Unified Example")

assets/htmlUnified.png

-158 KB
Binary file not shown.

example/dark-theme.css

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -153,65 +153,3 @@ a, a:visited {
153153
.DifferencesMerged th.ChangeDelete {
154154
background-image: linear-gradient(-45deg, #AAAAAA 0%, #EE9999 100%);
155155
}
156-
157-
/*
158-
* HTML Unified Diff
159-
*/
160-
161-
/* Line removed in new */
162-
.DifferencesUnified .ChangeDelete .Left::before {
163-
content: "- \00a0";
164-
}
165-
166-
.DifferencesUnified .ChangeDelete .Left {
167-
background: #EE9999;
168-
color: #272822;
169-
}
170-
171-
/* Line modified in old and new */
172-
.DifferencesUnified .ChangeReplace {
173-
background: #FFEE99;
174-
color: #272822;
175-
display: table;
176-
}
177-
178-
/* Line in old replaced by line in new */
179-
.DifferencesUnified .ChangeReplace .Left:first-child:before {
180-
content: "\250C \00a0";
181-
}
182-
183-
.DifferencesUnified .ChangeReplace .Left:before {
184-
content: "\251C \00a0";
185-
}
186-
187-
.DifferencesUnified .ChangeReplace .Left {
188-
background: #FFEE99;
189-
}
190-
191-
/* Line in new replaced line in old */
192-
.DifferencesUnified .ChangeReplace .Right:last-of-type:before {
193-
content: "\2514 \00a0";
194-
}
195-
196-
.DifferencesUnified .ChangeReplace .Right:before {
197-
content: "\251C \00a0";
198-
}
199-
200-
.DifferencesUnified .ChangeReplace .Right {
201-
background: #FFEE99;
202-
}
203-
204-
/* Line inserted in new */
205-
.DifferencesUnified .ChangeInsert .Right:before {
206-
content: "+ \00A0";
207-
}
208-
209-
/* Character inserted in line of new */
210-
.DifferencesUnified .ChangeReplace ins {
211-
background: #99EE99;
212-
}
213-
214-
/* Character removed from line in old */
215-
.DifferencesUnified .ChangeReplace del {
216-
background: #EE9999;
217-
}

example/example.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
use jblond\Diff\Renderer\Html\Inline;
55
use jblond\Diff\Renderer\Html\Merged;
66
use jblond\Diff\Renderer\Html\SideBySide;
7-
use jblond\Diff\Renderer\Html\Unified as HtmlUnified;
87
use jblond\Diff\Renderer\Text\Context;
98
use jblond\Diff\Renderer\Text\Unified;
109

@@ -99,13 +98,6 @@ function changeCSS(cssFile, cssLinkIndex) {
9998
echo $diff->isIdentical() ? 'No differences found.' : $diff->Render($renderer);
10099
?>
101100

102-
<h2>HTML Unified Diff</h2>
103-
<?php
104-
// Generate a unified diff.
105-
$renderer = new HtmlUnified($rendererOptions);
106-
echo $diff->isIdentical() ? 'No differences found.' : '<pre>' . $diff->Render($renderer) . '</pre>';
107-
?>
108-
109101
<h2>Text Unified Diff</h2>
110102
<?php
111103
// Generate a unified diff.

example/styles.css

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -132,63 +132,3 @@ pre {
132132
.DifferencesMerged th.ChangeDelete {
133133
background-image: linear-gradient(-45deg, #CCCCCC 0%, #EE9999 100%);
134134
}
135-
136-
/*
137-
* HTML Unified Diff
138-
*/
139-
140-
/* Line removed in new */
141-
.DifferencesUnified .ChangeDelete .Left::before {
142-
content: "- \00a0";
143-
}
144-
145-
.DifferencesUnified .ChangeDelete .Left {
146-
background: #CCCCCC;
147-
}
148-
149-
/* Line modified in old and new */
150-
.DifferencesUnified .ChangeReplace {
151-
display: table;
152-
background: #FFEE99;
153-
}
154-
155-
/* Line in old replaced by line in new */
156-
.DifferencesUnified .ChangeReplace .Left:first-child:before {
157-
content: "\250C \00a0";
158-
}
159-
160-
.DifferencesUnified .ChangeReplace .Left:before {
161-
content: "\251C \00a0";
162-
}
163-
164-
.DifferencesUnified .ChangeReplace .Left {
165-
background: #FFEE99;
166-
}
167-
168-
/* Line in new replaced line in old */
169-
.DifferencesUnified .ChangeReplace .Right:last-of-type:before {
170-
content: "\2514 \00a0";
171-
}
172-
173-
.DifferencesUnified .ChangeReplace .Right:before {
174-
content: "\251C \00a0";
175-
}
176-
177-
.DifferencesUnified .ChangeReplace .Right {
178-
background: #FFEE99;
179-
}
180-
181-
/* Line inserted in new */
182-
.DifferencesUnified .ChangeInsert .Right:before {
183-
content: "+ \00A0";
184-
}
185-
186-
/* Character inserted in line of new */
187-
.DifferencesUnified .ChangeReplace ins {
188-
background: #99EE99;
189-
}
190-
191-
/* Character removed from line in old */
192-
.DifferencesUnified .ChangeReplace del {
193-
background: #EE9999;
194-
}

lib/jblond/Diff.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
namespace jblond;
66

77
use InvalidArgumentException;
8-
use jblond\Diff\Renderer\Html\Inline;
9-
use jblond\Diff\Renderer\Html\SideBySide;
10-
use jblond\Diff\Renderer\Html\Unified as UnifiedHtml;
11-
use jblond\Diff\Renderer\Text\Context;
12-
use jblond\Diff\Renderer\Text\Unified;
138
use jblond\Diff\SequenceMatcher;
149
use jblond\Diff\Similarity;
1510
use OutOfRangeException;
@@ -179,8 +174,7 @@ public function getVersion2(): array
179174
/**
180175
* Render a diff-view using a rendering class and get its results.
181176
*
182-
* @param object|Context|Unified|UnifiedHtml|Inline|SideBySide $renderer An instance of the rendering object,
183-
* used for generating the diff-view.
177+
* @param object $renderer An instance of the rendering object, used for generating the diff-view.
184178
*
185179
* @return mixed The generated diff-view. The type of the return value depends on the applied renderer.
186180
*/

lib/jblond/Diff/Renderer/Html/Unified.php

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)