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

Keep one state for old and another for the new diff

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-05-09 11:15:57 +01:00
parent 719b1cde71
commit 73999bb782
No known key found for this signature in database
GPG key ID: 08E3C5F38969078E
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/ui/js/diff2html-ui.js
View file

@ -72,16 +72,35 @@
// collect all the diff files and execute the highlight on their lines
var $files = $target.find(".d2h-file-wrapper");
$files.map(function(i, file) {
var state;
var oldLinesState;
var newLinesState;
var $file = $(file);
var language = $file.data("lang");
// collect all the code lines and execute the highlight on them
var $codeLines = $file.find(".d2h-code-line-ctn");
$codeLines.map(function(i, line) {
var $line = $(line);
var text = line.textContent;
var result = hljs.getLanguage(language) ? hljs.highlight(language, text, true, state) : hljs.highlightAuto(text);
state = result.top;
var lineParent = line.parentNode;
var lineState;
if (lineParent.className.indexOf("d2h-del") !== -1) {
lineState = oldLinesState;
} else {
lineState = newLinesState;
}
var result = hljs.getLanguage(language) ? hljs.highlight(language, text, true, lineState) : hljs.highlightAuto(text);
if (lineParent.className.indexOf("d2h-del") !== -1) {
oldLinesState = result.top;
} else if (lineParent.className.indexOf("d2h-ins") !== -1) {
newLinesState = result.top;
} else {
oldLinesState = result.top;
newLinesState = result.top;
}
var originalStream = nodeStream(line);
if (originalStream.length) {
@ -90,13 +109,13 @@
result.value = mergeStreams(originalStream, nodeStream(resultNode), text);
}
var $line = $(line);
buildClassName(line.className, result.language)
.split(" ")
.map(function(className) {
$line.addClass(className);
});
$line.html(result.value);
});
});
};