Skip to content

Commit bed84b7

Browse files
authored
Merge pull request #178 from stockmind/emptyplaceholder
Target and style blank lines in side-by-side view
2 parents 9c2c1fe + a222ff6 commit bed84b7

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

src/side-by-side-printer.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,14 @@
224224
SideBySidePrinter.prototype.generateSingleLineHtml = function(isCombined, type, number, content, possiblePrefix) {
225225
var lineWithoutPrefix = content;
226226
var prefix = possiblePrefix;
227+
var lineClass = 'd2h-code-side-linenumber';
228+
var contentClass = 'd2h-code-side-line';
229+
230+
if (!number && !content) {
231+
lineClass += ' d2h-code-side-emptyplaceholder';
232+
contentClass += ' d2h-code-side-emptyplaceholder';
233+
type += ' d2h-emptyplaceholder';
234+
}
227235

228236
if (!prefix) {
229237
var lineWithPrefix = printerUtils.separatePrefix(isCombined, content);
@@ -234,8 +242,8 @@
234242
return hoganUtils.render(genericTemplatesPath, 'line',
235243
{
236244
type: type,
237-
lineClass: 'd2h-code-side-linenumber',
238-
contentClass: 'd2h-code-side-line',
245+
lineClass: lineClass,
246+
contentClass: contentClass,
239247
prefix: prefix,
240248
content: lineWithoutPrefix,
241249
lineNumber: number

src/ui/css/diff2html.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@
196196
text-overflow: ellipsis;
197197
}
198198

199+
.d2h-code-side-emptyplaceholder,
200+
.d2h-emptyplaceholder {
201+
background-color: #f1f1f1;
202+
border-color: #e1e1e1;
203+
}
204+
199205
/*
200206
* Changes Highlight
201207
*/

test/side-by-side-printer-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ describe('SideBySidePrinter', function() {
9999
' </div>\n' +
100100
' </td>\n' +
101101
'</tr><tr>\n' +
102-
' <td class="d2h-code-side-linenumber d2h-cntx">\n' +
102+
' <td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">\n' +
103103
' ' +
104104
'\n' +
105105
' </td>\n' +
106-
' <td class="d2h-cntx">\n' +
107-
' <div class="d2h-code-side-line d2h-cntx">\n' +
106+
' <td class="d2h-cntx d2h-emptyplaceholder">\n' +
107+
' <div class="d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">\n' +
108108
' </div>\n' +
109109
' </td>\n' +
110110
'</tr>';

0 commit comments

Comments
 (0)