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

better hightlight

Browse source
This commit is contained in:
Rodrigo Fernandes 2015-02-02 20:56:07 +00:00
parent edc5357e53
commit 22b6db6b7d
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
diff2html.js
View file

@ -3,7 +3,7 @@
* Diff to HTML (diff2html.js)
* Author: rtfpessoa
* Date: Friday 29 August 2014
* Last Update: Sunday 25 January 2015
* Last Update: Sunday 2 February 2015
*
* Diff command:
* git diff
@ -165,6 +165,9 @@
currentFile.oldName = values[1];
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ b\/(\S+).*$/.exec(line))) {
currentFile.newName = values[1];
var fileSplit = currentFile.newName.split(".");
currentFile.language = fileSplit[fileSplit.length - 1];
} else if (currentFile && startsWith(line, "@@")) {
startBlock(line);
} else if (currentBlock) {
@ -185,7 +188,7 @@
var generateJsonHtml = function (diffFiles) {
return "<div class=\"d2h-wrapper\">\n" +
diffFiles.map(function (file) {
return "<div class=\"d2h-file-wrapper\">\n" +
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
" <div class=\"d2h-file-header\">\n" +
" <div class=\"d2h-file-stats\">\n" +
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
@ -270,7 +273,7 @@
diffFiles.map(function (file) {
var diffs = generateSideBySideFileHtml(file);
return "<div class=\"d2h-file-wrapper\">\n" +
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
" <div class=\"d2h-file-header\">\n" +
" <div class=\"d2h-file-stats\">\n" +
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +

10
index.html
View file

@ -8,7 +8,7 @@
Diff to HTML (template.html)
Author: rtfpessoa
Date: Friday 29 August 2014
Last Update: Sunday 25 January 2015
Last Update: Sunday 2 February 2015
-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
@ -183,6 +183,14 @@
$(document).ready(function () {
var diffJson = Diff2Html.getJsonFromDiff(lineDiffExample);
var languages = diffJson.map(function (line) {
return line.language;
});
var uniqueLanguages = languages.filter(function (v, i) {
return languages.indexOf(v) == i;
});
hljs.configure({languages: uniqueLanguages});
$("#line-by-line").html(Diff2Html.getPrettyHtmlFromJson(diffJson));
var code = $(".d2h-code-line");
code.map(function (i, line) {