luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #178 from stockmind/emptyplaceholder

Browse source 
Target and style blank lines in side-by-side view
This commit is contained in:
Rodrigo Fernandes 2018-11-14 22:51:29 +00:00 committed by GitHub
commit bed84b7853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/side-by-side-printer.js
View file

@ -224,6 +224,14 @@
SideBySidePrinter.prototype.generateSingleLineHtml = function(isCombined, type, number, content, possiblePrefix) { SideBySidePrinter.prototype.generateSingleLineHtml = function(isCombined, type, number, content, possiblePrefix) {
var lineWithoutPrefix = content; var lineWithoutPrefix = content;
var prefix = possiblePrefix; var prefix = possiblePrefix;
var lineClass = 'd2h-code-side-linenumber';
var contentClass = 'd2h-code-side-line';
if (!number && !content) {
lineClass += ' d2h-code-side-emptyplaceholder';
contentClass += ' d2h-code-side-emptyplaceholder';
type += ' d2h-emptyplaceholder';
}
if (!prefix) { if (!prefix) {
var lineWithPrefix = printerUtils.separatePrefix(isCombined, content); var lineWithPrefix = printerUtils.separatePrefix(isCombined, content);
@ -234,8 +242,8 @@
return hoganUtils.render(genericTemplatesPath, 'line', return hoganUtils.render(genericTemplatesPath, 'line',
{ {
type: type, type: type,
lineClass: 'd2h-code-side-linenumber', lineClass: lineClass,
contentClass: 'd2h-code-side-line', contentClass: contentClass,
prefix: prefix, prefix: prefix,
content: lineWithoutPrefix, content: lineWithoutPrefix,
lineNumber: number lineNumber: number

6
src/ui/css/diff2html.css
View file

@ -196,6 +196,12 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.d2h-code-side-emptyplaceholder,
.d2h-emptyplaceholder {
background-color: #f1f1f1;
border-color: #e1e1e1;
}
/* /*
* Changes Highlight * Changes Highlight
*/ */

6
test/side-by-side-printer-tests.js
View file

@ -99,12 +99,12 @@ describe('SideBySidePrinter', function() {
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
'</tr><tr>\n' + '</tr><tr>\n' +
' <td class="d2h-code-side-linenumber d2h-cntx">\n' + ' <td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">\n' +
' ' + ' ' +
'\n' + '\n' +
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx d2h-emptyplaceholder">\n' +
' <div class="d2h-code-side-line d2h-cntx">\n' + ' <div class="d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
'</tr>'; '</tr>';