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

Makes LineByLine more object oriented

Browse source
This commit is contained in:
Paulo Bu 2015-12-20 15:51:56 +01:00
parent ff8eca3a7b
commit 4a06df6039
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/html-printer.js
View file

@ -13,7 +13,9 @@
function HtmlPrinter() { function HtmlPrinter() {
} }
HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml; HtmlPrinter.prototype.generateLineByLineJsonHtml = function(diffFiles, config) {
return lineByLinePrinter.generateLineByLineJsonHtml(diffFiles, config);
};
HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml; HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;

28
src/line-by-line-printer.js
View file

@ -16,14 +16,15 @@
} }
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function(diffFiles, config) { LineByLinePrinter.prototype.generateLineByLineJsonHtml = function(diffFiles, config) {
self = this;
return '<div class="d2h-wrapper">\n' + return '<div class="d2h-wrapper">\n' +
diffFiles.map(function(file) { diffFiles.map(function(file) {
var diffs; var diffs;
if (file.blocks.length) { if (file.blocks.length) {
diffs = generateFileHtml(file, config); diffs = self.generateFileHtml(file, config);
} else { } else {
diffs = generateEmptyDiff(); diffs = self.generateEmptyDiff();
} }
return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' + return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
@ -58,7 +59,8 @@
return Rematch.distance(amod, bmod); return Rematch.distance(amod, bmod);
}); });
function generateFileHtml(file, config) { LineByLinePrinter.prototype.generateFileHtml = function(file, config) {
self = this;
return file.blocks.map(function(block) { return file.blocks.map(function(block) {
var lines = '<tr>\n' + var lines = '<tr>\n' +
@ -101,15 +103,15 @@
var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config);
processedOldLines += processedOldLines +=
generateLineHtml(deleteType, oldLine.oldNumber, oldLine.newNumber, self.generateLineHtml(deleteType, oldLine.oldNumber, oldLine.newNumber,
diff.first.line, diff.first.prefix); diff.first.line, diff.first.prefix);
processedNewLines += processedNewLines +=
generateLineHtml(insertType, newLine.oldNumber, newLine.newNumber, self.generateLineHtml(insertType, newLine.oldNumber, newLine.newNumber,
diff.second.line, diff.second.prefix); diff.second.line, diff.second.prefix);
} }
lines += processedOldLines + processedNewLines; lines += processedOldLines + processedNewLines;
lines += processLines(oldLines.slice(common), newLines.slice(common)); lines += self.processLines(oldLines.slice(common), newLines.slice(common));
processedOldLines = []; processedOldLines = [];
processedNewLines = []; processedNewLines = [];
@ -127,9 +129,9 @@
processChangeBlock(); processChangeBlock();
} }
if (line.type == diffParser.LINE_TYPE.CONTEXT) { if (line.type == diffParser.LINE_TYPE.CONTEXT) {
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine); lines += self.generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length) { } else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length) {
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine); lines += self.generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
} else if (line.type == diffParser.LINE_TYPE.DELETES) { } else if (line.type == diffParser.LINE_TYPE.DELETES) {
oldLines.push(line); oldLines.push(line);
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !!oldLines.length) { } else if (line.type == diffParser.LINE_TYPE.INSERTS && !!oldLines.length) {
@ -146,25 +148,25 @@
}).join('\n'); }).join('\n');
} }
function processLines(oldLines, newLines) { LineByLinePrinter.prototype.processLines = function(oldLines, newLines) {
var lines = ''; var lines = '';
for (j = 0; j < oldLines.length; j++) { for (j = 0; j < oldLines.length; j++) {
var oldLine = oldLines[j]; var oldLine = oldLines[j];
var oldEscapedLine = utils.escape(oldLine.content); var oldEscapedLine = utils.escape(oldLine.content);
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine); lines += this.generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
} }
for (j = 0; j < newLines.length; j++) { for (j = 0; j < newLines.length; j++) {
var newLine = newLines[j]; var newLine = newLines[j];
var newEscapedLine = utils.escape(newLine.content); var newEscapedLine = utils.escape(newLine.content);
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine); lines += this.generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
} }
return lines; return lines;
} }
function generateLineHtml(type, oldNumber, newNumber, content, prefix) { LineByLinePrinter.prototype.generateLineHtml = function(type, oldNumber, newNumber, content, prefix) {
var htmlPrefix = ''; var htmlPrefix = '';
if (prefix) { if (prefix) {
htmlPrefix = '<span class="d2h-code-line-prefix">' + prefix + '</span>'; htmlPrefix = '<span class="d2h-code-line-prefix">' + prefix + '</span>';
@ -186,7 +188,7 @@
'</tr>\n'; '</tr>\n';
} }
function generateEmptyDiff() { LineByLinePrinter.prototype.generateEmptyDiff = function() {
return '<tr>\n' + return '<tr>\n' +
' <td class="' + diffParser.LINE_TYPE.INFO + '">' + ' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
' <div class="d2h-code-line ' + diffParser.LINE_TYPE.INFO + '">' + ' <div class="d2h-code-line ' + diffParser.LINE_TYPE.INFO + '">' +