Merge pull request #306 from rtfpessoa/fix-selection-empty-lines
fix: Allow selection of empty lines
This commit is contained in:
Rodrigo Fernandes
GitHub
commit
90d37608c8
2 changed files with 210 additions and 206 deletions
|
|
@ -624,7 +624,7 @@ describe('Diff2Html', () => {
|
|||
' \n';
|
||||
const result = html(diffExample2, { drawFileList: false });
|
||||
expect(result).toMatchInlineSnapshot(`
|
||||
"<div class=\\"d2h-wrapper\\">
|
||||
"<div class=\\"d2h-wrapper\\">
|
||||
<div id=\\"d2h-211439\\" class=\\"d2h-file-wrapper\\" data-lang=\\"md\\">
|
||||
<div class=\\"d2h-file-header\\">
|
||||
<span class=\\"d2h-file-name-wrapper\\">
|
||||
|
|
@ -642,10 +642,10 @@ describe('Diff2Html', () => {
|
|||
<td class=\\"d2h-info\\">
|
||||
<div class=\\"d2h-code-line d2h-info\\">@@ -1,7 +1,6 @@</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">1</div>
|
||||
<div class=\\"line-num2\\">1</div>
|
||||
<div class=\\"line-num2\\">1</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -653,10 +653,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\"># Change Log</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">2</div>
|
||||
<div class=\\"line-num2\\">2</div>
|
||||
<div class=\\"line-num2\\">2</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -664,10 +664,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">All notable changes to this project will be documented in this file.</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">3</div>
|
||||
<div class=\\"line-num2\\">3</div>
|
||||
<div class=\\"line-num2\\">3</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -675,10 +675,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">This project adheres to [Semantic Versioning](http://semver.org/).</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-del\\">
|
||||
<div class=\\"line-num1\\">4</div>
|
||||
<div class=\\"line-num2\\"></div>
|
||||
<div class=\\"line-num2\\"></div>
|
||||
</td>
|
||||
<td class=\\"d2h-del\\">
|
||||
<div class=\\"d2h-code-line d2h-del\\">
|
||||
|
|
@ -686,10 +686,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">$a="<table><tr><td>Use the following format for additions: \` - VERSION: [feature/patch (if applicable)] Short description of change. Links to relevant issues/PRs.\`</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">5</div>
|
||||
<div class=\\"line-num2\\">4</div>
|
||||
<div class=\\"line-num2\\">4</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -697,10 +697,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">$a="<table><tr><td></span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">6</div>
|
||||
<div class=\\"line-num2\\">5</div>
|
||||
<div class=\\"line-num2\\">5</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -708,10 +708,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">$a="<table><tr><td>- 1.1.9: Fix around ubuntu's inability to cache promises. [#877](https://github.com/FredrikNoren/ungit/pull/878)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">7</div>
|
||||
<div class=\\"line-num2\\">6</div>
|
||||
<div class=\\"line-num2\\">6</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -719,16 +719,16 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">- 1.1.8:</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-info\\"></td>
|
||||
<td class=\\"d2h-info\\">
|
||||
<div class=\\"d2h-code-line d2h-info\\">@@ -11,7 +10,7 @@ $a="<table><tr><td>- 1.1.9: Fix around ubuntu's inability to cache promises. [#8</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">11</div>
|
||||
<div class=\\"line-num2\\">10</div>
|
||||
<div class=\\"line-num2\\">10</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -736,10 +736,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">- 1.1.7:</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">12</div>
|
||||
<div class=\\"line-num2\\">11</div>
|
||||
<div class=\\"line-num2\\">11</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -747,10 +747,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\"> - Fix diff flickering issue and optimization [#865](https://github.com/FredrikNoren/ungit/pull/865)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">13</div>
|
||||
<div class=\\"line-num2\\">12</div>
|
||||
<div class=\\"line-num2\\">12</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -758,10 +758,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\"> - Fix credential dialog issue [#864](https://github.com/FredrikNoren/ungit/pull/864)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-del d2h-change\\">
|
||||
<div class=\\"line-num1\\">14</div>
|
||||
<div class=\\"line-num2\\"></div>
|
||||
<div class=\\"line-num2\\"></div>
|
||||
</td>
|
||||
<td class=\\"d2h-del d2h-change\\">
|
||||
<div class=\\"d2h-code-line d2h-del d2h-change\\">
|
||||
|
|
@ -769,10 +769,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\"> - Fix HEAD branch order when redraw [#858](https://github.com/FredrikNoren/ungit/issues/858)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-ins d2h-change\\">
|
||||
<div class=\\"line-num1\\"></div>
|
||||
<div class=\\"line-num2\\">13</div>
|
||||
<div class=\\"line-num2\\">13</div>
|
||||
</td>
|
||||
<td class=\\"d2h-ins d2h-change\\">
|
||||
<div class=\\"d2h-code-line d2h-ins d2h-change\\">
|
||||
|
|
@ -780,10 +780,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\"><ins>4</ins> - Fix HEAD branch order when redraw [#858](https://github.com/FredrikNoren/ungit/issues/858)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">15</div>
|
||||
<div class=\\"line-num2\\">14</div>
|
||||
<div class=\\"line-num2\\">14</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -791,10 +791,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">- 1.1.6: Fix path auto complete [#861](https://github.com/FredrikNoren/ungit/issues/861)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">16</div>
|
||||
<div class=\\"line-num2\\">15</div>
|
||||
<div class=\\"line-num2\\">15</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -802,10 +802,10 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">- 1.1.5: Update "Toggle all" button after commit or changing selected files [#859](https://github.com/FredrikNoren/ungit/issues/859)</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">17</div>
|
||||
<div class=\\"line-num2\\">16</div>
|
||||
<div class=\\"line-num2\\">16</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
|
|
@ -813,24 +813,25 @@ describe('Diff2Html', () => {
|
|||
<span class=\\"d2h-code-line-ctn\\">- 1.1.4: [patch] Promise refactoring</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr><tr>
|
||||
</tr><tr>
|
||||
<td class=\\"d2h-code-linenumber d2h-cntx\\">
|
||||
<div class=\\"line-num1\\">18</div>
|
||||
<div class=\\"line-num2\\">17</div>
|
||||
<div class=\\"line-num2\\">17</div>
|
||||
</td>
|
||||
<td class=\\"d2h-cntx\\">
|
||||
<div class=\\"d2h-code-line d2h-cntx\\">
|
||||
<span class=\\"d2h-code-line-prefix\\"> </span>
|
||||
<span class=\\"d2h-code-line-ctn\\"><br></span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>"
|
||||
`);
|
||||
</div>
|
||||
</div>"
|
||||
`);
|
||||
});
|
||||
|
||||
it('should generate html correctly without escaping twice', () => {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
{{#content}}
|
||||
<span class="d2h-code-line-ctn">{{{content}}}</span>
|
||||
{{/content}}
|
||||
{{^content}}
|
||||
<span class="d2h-code-line-ctn"><br></span>
|
||||
{{/content}}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Reference in a new issue