Skip to content

Commit 22b6db6

Browse files
committed
better hightlight
1 parent edc5357 commit 22b6db6

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

diff2html.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Diff to HTML (diff2html.js)
44
* Author: rtfpessoa
55
* Date: Friday 29 August 2014
6-
* Last Update: Sunday 25 January 2015
6+
* Last Update: Sunday 2 February 2015
77
*
88
* Diff command:
99
* git diff
@@ -165,6 +165,9 @@
165165
currentFile.oldName = values[1];
166166
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ b\/(\S+).*$/.exec(line))) {
167167
currentFile.newName = values[1];
168+
169+
var fileSplit = currentFile.newName.split(".");
170+
currentFile.language = fileSplit[fileSplit.length - 1];
168171
} else if (currentFile && startsWith(line, "@@")) {
169172
startBlock(line);
170173
} else if (currentBlock) {
@@ -185,7 +188,7 @@
185188
var generateJsonHtml = function (diffFiles) {
186189
return "<div class=\"d2h-wrapper\">\n" +
187190
diffFiles.map(function (file) {
188-
return "<div class=\"d2h-file-wrapper\">\n" +
191+
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
189192
" <div class=\"d2h-file-header\">\n" +
190193
" <div class=\"d2h-file-stats\">\n" +
191194
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
@@ -270,7 +273,7 @@
270273
diffFiles.map(function (file) {
271274
var diffs = generateSideBySideFileHtml(file);
272275

273-
return "<div class=\"d2h-file-wrapper\">\n" +
276+
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
274277
" <div class=\"d2h-file-header\">\n" +
275278
" <div class=\"d2h-file-stats\">\n" +
276279
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +

index.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Diff to HTML (template.html)
99
Author: rtfpessoa
1010
Date: Friday 29 August 2014
11-
Last Update: Sunday 25 January 2015
11+
Last Update: Sunday 2 February 2015
1212
-->
1313

1414
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
@@ -183,6 +183,14 @@
183183
$(document).ready(function () {
184184
var diffJson = Diff2Html.getJsonFromDiff(lineDiffExample);
185185

186+
var languages = diffJson.map(function (line) {
187+
return line.language;
188+
});
189+
var uniqueLanguages = languages.filter(function (v, i) {
190+
return languages.indexOf(v) == i;
191+
});
192+
hljs.configure({languages: uniqueLanguages});
193+
186194
$("#line-by-line").html(Diff2Html.getPrettyHtmlFromJson(diffJson));
187195
var code = $(".d2h-code-line");
188196
code.map(function (i, line) {

0 commit comments

Comments
 (0)