Skip to content

Commit 4e6db58

Browse files
rtfpessoartfpessoa
authored
Merge pull request #228 from kaishuu0123/feat/replace-space-to-nbsp
Replace space to   for HTML Rendering.
2 parents faeb7b7 + 201c6a9 commit 4e6db58

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

‎src/line-by-line-printer.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
lineWithoutPrefix = lineWithPrefix.line;
212212
}
213213

214+
if (prefix === ' ') {
215+
prefix = ' ';
216+
}
217+
214218
return hoganUtils.render(genericTemplatesPath, 'line',
215219
{
216220
type: type,

‎src/side-by-side-printer.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@
244244
lineWithoutPrefix = lineWithPrefix.line;
245245
}
246246

247+
if (prefix === ' ') {
248+
prefix = ' ';
249+
}
250+
247251
return hoganUtils.render(genericTemplatesPath, 'line',
248252
{
249253
type: type,

‎test/diff2html-tests.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ describe('Diff2Html', function() {
335335
' </td>\n' +
336336
' <td class="d2h-cntx">\n' +
337337
' <div class="d2h-code-line d2h-cntx">\n' +
338-
' <span class="d2h-code-line-prefix"> </span>\n' +
338+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
339339
' <span class="d2h-code-line-ctn"># Change Log</span>\n' +
340340
' </div>\n' +
341341
' </td>\n' +
@@ -346,7 +346,7 @@ describe('Diff2Html', function() {
346346
' </td>\n' +
347347
' <td class="d2h-cntx">\n' +
348348
' <div class="d2h-code-line d2h-cntx">\n' +
349-
' <span class="d2h-code-line-prefix"> </span>\n' +
349+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
350350
' <span class="d2h-code-line-ctn">All notable changes to this project will be documented in this file.</span>\n' +
351351
' </div>\n' +
352352
' </td>\n' +
@@ -357,7 +357,7 @@ describe('Diff2Html', function() {
357357
' </td>\n' +
358358
' <td class="d2h-cntx">\n' +
359359
' <div class="d2h-code-line d2h-cntx">\n' +
360-
' <span class="d2h-code-line-prefix"> </span>\n' +
360+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
361361
' <span class="d2h-code-line-ctn">This project adheres to [Semantic Versioning](http:&#x2F;&#x2F;semver.org&#x2F;).</span>\n' +
362362
' </div>\n' +
363363
' </td>\n' +
@@ -379,7 +379,7 @@ describe('Diff2Html', function() {
379379
' </td>\n' +
380380
' <td class="d2h-cntx">\n' +
381381
' <div class="d2h-code-line d2h-cntx">\n' +
382-
' <span class="d2h-code-line-prefix"> </span>\n' +
382+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
383383
' <span class="d2h-code-line-ctn">$a=&quot;&lt;table&gt;&lt;tr&gt;&lt;td&gt;</span>\n' +
384384
' </div>\n' +
385385
' </td>\n' +
@@ -390,7 +390,7 @@ describe('Diff2Html', function() {
390390
' </td>\n' +
391391
' <td class="d2h-cntx">\n' +
392392
' <div class="d2h-code-line d2h-cntx">\n' +
393-
' <span class="d2h-code-line-prefix"> </span>\n' +
393+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
394394
' <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' +
395395
' </div>\n' +
396396
' </td>\n' +
@@ -401,7 +401,7 @@ describe('Diff2Html', function() {
401401
' </td>\n' +
402402
' <td class="d2h-cntx">\n' +
403403
' <div class="d2h-code-line d2h-cntx">\n' +
404-
' <span class="d2h-code-line-prefix"> </span>\n' +
404+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
405405
' <span class="d2h-code-line-ctn">- 1.1.8:</span>\n' +
406406
' </div>\n' +
407407
' </td>\n' +
@@ -418,7 +418,7 @@ describe('Diff2Html', function() {
418418
' </td>\n' +
419419
' <td class="d2h-cntx">\n' +
420420
' <div class="d2h-code-line d2h-cntx">\n' +
421-
' <span class="d2h-code-line-prefix"> </span>\n' +
421+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
422422
' <span class="d2h-code-line-ctn">- 1.1.7:</span>\n' +
423423
' </div>\n' +
424424
' </td>\n' +
@@ -429,7 +429,7 @@ describe('Diff2Html', function() {
429429
' </td>\n' +
430430
' <td class="d2h-cntx">\n' +
431431
' <div class="d2h-code-line d2h-cntx">\n' +
432-
' <span class="d2h-code-line-prefix"> </span>\n' +
432+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
433433
' <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' +
434434
' </div>\n' +
435435
' </td>\n' +
@@ -440,7 +440,7 @@ describe('Diff2Html', function() {
440440
' </td>\n' +
441441
' <td class="d2h-cntx">\n' +
442442
' <div class="d2h-code-line d2h-cntx">\n' +
443-
' <span class="d2h-code-line-prefix"> </span>\n' +
443+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
444444
' <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' +
445445
' </div>\n' +
446446
' </td>\n' +
@@ -473,7 +473,7 @@ describe('Diff2Html', function() {
473473
' </td>\n' +
474474
' <td class="d2h-cntx">\n' +
475475
' <div class="d2h-code-line d2h-cntx">\n' +
476-
' <span class="d2h-code-line-prefix"> </span>\n' +
476+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
477477
' <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' +
478478
' </div>\n' +
479479
' </td>\n' +
@@ -484,7 +484,7 @@ describe('Diff2Html', function() {
484484
' </td>\n' +
485485
' <td class="d2h-cntx">\n' +
486486
' <div class="d2h-code-line d2h-cntx">\n' +
487-
' <span class="d2h-code-line-prefix"> </span>\n' +
487+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
488488
' <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' +
489489
' </div>\n' +
490490
' </td>\n' +
@@ -495,7 +495,7 @@ describe('Diff2Html', function() {
495495
' </td>\n' +
496496
' <td class="d2h-cntx">\n' +
497497
' <div class="d2h-code-line d2h-cntx">\n' +
498-
' <span class="d2h-code-line-prefix"> </span>\n' +
498+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
499499
' <span class="d2h-code-line-ctn">- 1.1.4: [patch] Promise refactoring</span>\n' +
500500
' </div>\n' +
501501
' </td>\n' +
@@ -506,7 +506,7 @@ describe('Diff2Html', function() {
506506
' </td>\n' +
507507
' <td class="d2h-cntx">\n' +
508508
' <div class="d2h-code-line d2h-cntx">\n' +
509-
' <span class="d2h-code-line-prefix"> </span>\n' +
509+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
510510
' </div>\n' +
511511
' </td>\n' +
512512
'</tr>\n' +

‎test/line-by-line-tests.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ describe('LineByLinePrinter', function() {
559559
' </td>\n' +
560560
' <td class="d2h-cntx">\n' +
561561
' <div class="d2h-code-line d2h-cntx">\n' +
562-
' <span class="d2h-code-line-prefix"> </span>\n' +
562+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
563563
' <span class="d2h-code-line-ctn">one context line</span>\n' +
564564
' </div>\n' +
565565
' </td>\n' +

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ describe('SideBySidePrinter', function() {
8484
' </td>\n' +
8585
' <td class="d2h-cntx">\n' +
8686
' <div class="d2h-code-side-line d2h-cntx">\n' +
87-
' <span class="d2h-code-line-prefix"> </span>\n' +
87+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
8888
' <span class="d2h-code-line-ctn">context</span>\n' +
8989
' </div>\n' +
9090
' </td>\n' +
@@ -121,7 +121,7 @@ describe('SideBySidePrinter', function() {
121121
' </td>\n' +
122122
' <td class="d2h-cntx">\n' +
123123
' <div class="d2h-code-side-line d2h-cntx">\n' +
124-
' <span class="d2h-code-line-prefix"> </span>\n' +
124+
' <span class="d2h-code-line-prefix">&nbsp;</span>\n' +
125125
' <span class="d2h-code-line-ctn">context</span>\n' +
126126
' </div>\n' +
127127
' </td>\n' +

0 commit comments

Comments
 (0)