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

fix: Skip selection of structural lines in side diff

Browse source
This commit is contained in:
Rodrigo Fernandes 2020-02-09 19:01:30 +00:00
parent 90d37608c8
commit 05c774139a
No known key found for this signature in database
GPG key ID: 67157D2E3D4258B4
4 changed files with 132 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/__tests__/side-by-side-printer-tests.ts
View file

@ -111,7 +111,7 @@ describe('SideBySideRenderer', () => {
<td class=\\"d2h-cntx d2h-emptyplaceholder\\"> <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
<div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\"> <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
<span class=\\"d2h-code-line-prefix\\">&nbsp;</span> <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
<span class=\\"d2h-code-line-ctn\\">&nbsp;</span> <span class=\\"d2h-code-line-ctn\\"><br></span>
</div> </div>
</td> </td>
</tr>", </tr>",
@ -176,7 +176,7 @@ describe('SideBySideRenderer', () => {
<td class=\\"d2h-cntx d2h-emptyplaceholder\\"> <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
<div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\"> <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
<span class=\\"d2h-code-line-prefix\\">&nbsp;</span> <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
<span class=\\"d2h-code-line-ctn\\">&nbsp;</span> <span class=\\"d2h-code-line-ctn\\"><br></span>
</div> </div>
</td> </td>
</tr>", </tr>",
@ -227,7 +227,7 @@ describe('SideBySideRenderer', () => {
<td class=\\"d2h-cntx d2h-emptyplaceholder\\"> <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
<div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\"> <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
<span class=\\"d2h-code-line-prefix\\">&nbsp;</span> <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
<span class=\\"d2h-code-line-ctn\\">&nbsp;</span> <span class=\\"d2h-code-line-ctn\\"><br></span>
</div> </div>
</td> </td>
</tr>", </tr>",

4
src/side-by-side-renderer.ts
View file

@ -285,8 +285,8 @@ export default class SideBySideRenderer {
type: line?.type || `${renderUtils.CSSLineClass.CONTEXT} d2h-emptyplaceholder`, type: line?.type || `${renderUtils.CSSLineClass.CONTEXT} d2h-emptyplaceholder`,
lineClass: line !== undefined ? lineClass : `${lineClass} d2h-code-side-emptyplaceholder`, lineClass: line !== undefined ? lineClass : `${lineClass} d2h-code-side-emptyplaceholder`,
contentClass: line !== undefined ? contentClass : `${contentClass} d2h-code-side-emptyplaceholder`, contentClass: line !== undefined ? contentClass : `${contentClass} d2h-code-side-emptyplaceholder`,
prefix: line?.prefix === ' ' ? '&nbsp;' : line?.prefix || '&nbsp;', prefix: line?.prefix === ' ' ? '&nbsp;' : line?.prefix,
content: line?.content || '&nbsp;', content: line?.content,
lineNumber: line?.number, lineNumber: line?.number,
}); });
} }

3
src/templates/generic-line.mustache
View file

@ -7,6 +7,9 @@
{{#prefix}} {{#prefix}}
<span class="d2h-code-line-prefix">{{{prefix}}}</span> <span class="d2h-code-line-prefix">{{{prefix}}}</span>
{{/prefix}} {{/prefix}}
{{^prefix}}
<span class="d2h-code-line-prefix">&nbsp;</span>
{{/prefix}}
{{#content}} {{#content}}
<span class="d2h-code-line-ctn">{{{content}}}</span> <span class="d2h-code-line-ctn">{{{content}}}</span>
{{/content}} {{/content}}

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

@ -207,7 +207,8 @@
.d2h-code-linenumber, .d2h-code-linenumber,
.d2h-code-side-linenumber, .d2h-code-side-linenumber,
.d2h-code-line-prefix { .d2h-code-line-prefix,
.d2h-emptyplaceholder {
user-select: none; user-select: none;
} }