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

Merge pull request #228 from kaishuu0123/feat/replace-space-to-nbsp

Browse source 
Replace space to   for HTML Rendering.
This commit is contained in:
Rodrigo Fernandes 2019-07-07 14:07:34 +01:00 committed by GitHub
commit 4e6db583e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/line-by-line-printer.js
View file

@ -211,6 +211,10 @@
lineWithoutPrefix = lineWithPrefix.line; lineWithoutPrefix = lineWithPrefix.line;
} }
if (prefix === ' ') {
prefix = ' ';
}
return hoganUtils.render(genericTemplatesPath, 'line', return hoganUtils.render(genericTemplatesPath, 'line',
{ {
type: type, type: type,

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

@ -244,6 +244,10 @@
lineWithoutPrefix = lineWithPrefix.line; lineWithoutPrefix = lineWithPrefix.line;
} }
if (prefix === ' ') {
prefix = ' ';
}
return hoganUtils.render(genericTemplatesPath, 'line', return hoganUtils.render(genericTemplatesPath, 'line',
{ {
type: type, type: type,

26
test/diff2html-tests.js
View file

@ -335,7 +335,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn"># Change Log</span>\n' + ' <span class="d2h-code-line-ctn"># Change Log</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -346,7 +346,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">All notable changes to this project will be documented in this file.</span>\n' + ' <span class="d2h-code-line-ctn">All notable changes to this project will be documented in this file.</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -357,7 +357,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">This project adheres to [Semantic Versioning](http:&#x2F;&#x2F;semver.org&#x2F;).</span>\n' + ' <span class="d2h-code-line-ctn">This project adheres to [Semantic Versioning](http:&#x2F;&#x2F;semver.org&#x2F;).</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -379,7 +379,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;</span>\n' + ' <span class="d2h-code-line-ctn">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -390,7 +390,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#877](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;878)</span>\n' + ' <span class="d2h-code-line-ctn">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;- 1.1.9: Fix around ubuntu&#x27;s inability to cache promises. [#877](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;878)</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -401,7 +401,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">- 1.1.8:</span>\n' + ' <span class="d2h-code-line-ctn">- 1.1.8:</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -418,7 +418,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">- 1.1.7:</span>\n' + ' <span class="d2h-code-line-ctn">- 1.1.7:</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -429,7 +429,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn"> - Fix diff flickering issue and optimization [#865](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;865)</span>\n' + ' <span class="d2h-code-line-ctn"> - Fix diff flickering issue and optimization [#865](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;865)</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -440,7 +440,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn"> - Fix credential dialog issue [#864](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;864)</span>\n' + ' <span class="d2h-code-line-ctn"> - Fix credential dialog issue [#864](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;pull&#x2F;864)</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -473,7 +473,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">- 1.1.6: Fix path auto complete [#861](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;861)</span>\n' + ' <span class="d2h-code-line-ctn">- 1.1.6: Fix path auto complete [#861](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;861)</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -484,7 +484,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">- 1.1.5: Update &quot;Toggle all&quot; button after commit or changing selected files [#859](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;859)</span>\n' + ' <span class="d2h-code-line-ctn">- 1.1.5: Update &quot;Toggle all&quot; button after commit or changing selected files [#859](https:&#x2F;&#x2F;github.com&#x2F;FredrikNoren&#x2F;ungit&#x2F;issues&#x2F;859)</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -495,7 +495,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">- 1.1.4: [patch] Promise refactoring</span>\n' + ' <span class="d2h-code-line-ctn">- 1.1.4: [patch] Promise refactoring</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -506,7 +506,7 @@ describe('Diff2Html', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
'</tr>\n' + '</tr>\n' +

2
test/line-by-line-tests.js
View file

@ -559,7 +559,7 @@ describe('LineByLinePrinter', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-line d2h-cntx">\n' + ' <div class="d2h-code-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">one context line</span>\n' + ' <span class="d2h-code-line-ctn">one context line</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +

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

@ -84,7 +84,7 @@ describe('SideBySidePrinter', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-side-line d2h-cntx">\n' + ' <div class="d2h-code-side-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">context</span>\n' + ' <span class="d2h-code-line-ctn">context</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +
@ -121,7 +121,7 @@ describe('SideBySidePrinter', function() {
' </td>\n' + ' </td>\n' +
' <td class="d2h-cntx">\n' + ' <td class="d2h-cntx">\n' +
' <div class="d2h-code-side-line d2h-cntx">\n' + ' <div class="d2h-code-side-line d2h-cntx">\n' +
' <span class="d2h-code-line-prefix"> </span>\n' + ' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
' <span class="d2h-code-line-ctn">context</span>\n' + ' <span class="d2h-code-line-ctn">context</span>\n' +
' </div>\n' + ' </div>\n' +
' </td>\n' + ' </td>\n' +