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

fix missing line escaping

Browse source
This commit is contained in:
Rodrigo Fernandes 2014-09-27 15:47:10 +01:00
parent 73c44bf6f3
commit 1f53a81a3b
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
diff2html.js
View file

@ -229,8 +229,9 @@
(!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) && (!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
(!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES); (!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
if (isOppositeTypeTwoLineBlock) {
var escapedLine = escape(line.content); var escapedLine = escape(line.content);
if (isOppositeTypeTwoLineBlock) {
var nextEscapedLine = escape(newLine.content); var nextEscapedLine = escape(newLine.content);
var diff = diffHighlight(escapedLine, nextEscapedLine); var diff = diffHighlight(escapedLine, nextEscapedLine);
@ -240,7 +241,7 @@
i++; i++;
} else { } else {
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, line.content); lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
} }
} }
@ -333,8 +334,9 @@
(!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) && (!nextNewLine || nextNewLine && nextNewLine.type != LINE_TYPE.INSERTS) &&
(!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES); (!prevLine || prevLine && prevLine.type != LINE_TYPE.DELETES);
if (isOpositeTypeTwoLineBlock) {
var escapedLine = escape(line.content); var escapedLine = escape(line.content);
if (isOpositeTypeTwoLineBlock) {
var nextEscapedLine = escape(newLine.content); var nextEscapedLine = escape(newLine.content);
var diff = diffHighlight(escapedLine, nextEscapedLine); var diff = diffHighlight(escapedLine, nextEscapedLine);
@ -344,14 +346,14 @@
i++; i++;
} else if (line.type == LINE_TYPE.DELETES) { } else if (line.type == LINE_TYPE.DELETES) {
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, line.content); fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
fileHtml.right += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", ""); fileHtml.right += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
} else if (line.type == LINE_TYPE.INSERTS) { } else if (line.type == LINE_TYPE.INSERTS) {
fileHtml.left += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", ""); fileHtml.left += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", "");
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, line.content); fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
} else { } else {
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, line.content); fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, line.content); fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
} }
} }

2
diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long