diff --git a/src/html-printer.js b/src/html-printer.js index e5d6b2d..a132d29 100644 --- a/src/html-printer.js +++ b/src/html-printer.js @@ -18,7 +18,9 @@ return lineByLinePrinter.generateLineByLineJsonHtml(diffFiles); }; - HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml; + HtmlPrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { + return sideBySidePrinter.generateSideBySideJsonHtml(diffFiles, config); + }; module.exports.HtmlPrinter = new HtmlPrinter(); diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js index 6983728..93a8bd8 100644 --- a/src/side-by-side-printer.js +++ b/src/side-by-side-printer.js @@ -16,14 +16,15 @@ } SideBySidePrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { + var that = this; return '
\n' + diffFiles.map(function(file) { var diffs; if (file.blocks.length) { - diffs = generateSideBySideFileHtml(file, config); + diffs = that.generateSideBySideFileHtml(file, config); } else { - diffs = generateEmptyDiff(); + diffs = that.generateEmptyDiff(); } return '
\n' + @@ -69,7 +70,8 @@ return Rematch.distance(amod, bmod); }); - function generateSideBySideFileHtml(file, config) { + SideBySidePrinter.prototype.generateSideBySideFileHtml = function(file, config) { + var that = this; var fileHtml = {}; fileHtml.left = ''; fileHtml.right = ''; @@ -127,10 +129,10 @@ var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); fileHtml.left += - generateSingleLineHtml(deleteType, oldLine.oldNumber, + that.generateSingleLineHtml(deleteType, oldLine.oldNumber, diff.first.line, diff.first.prefix); fileHtml.right += - generateSingleLineHtml(insertType, newLine.newNumber, + that.generateSingleLineHtml(insertType, newLine.newNumber, diff.second.line, diff.second.prefix); } @@ -138,7 +140,7 @@ var oldSlice = oldLines.slice(common); var newSlice = newLines.slice(common); - var tmpHtml = processLines(oldSlice, newSlice); + var tmpHtml = that.processLines(oldSlice, newSlice); fileHtml.left += tmpHtml.left; fileHtml.right += tmpHtml.right; } @@ -159,11 +161,11 @@ } if (line.type === diffParser.LINE_TYPE.CONTEXT) { - fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine, prefix); - fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); + fileHtml.left += that.generateSingleLineHtml(line.type, line.oldNumber, escapedLine, prefix); + fileHtml.right += that.generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); } else if (line.type === diffParser.LINE_TYPE.INSERTS && !oldLines.length) { - fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); - fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); + fileHtml.left += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.right += that.generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); } else if (line.type === diffParser.LINE_TYPE.DELETES) { oldLines.push(line); } else if (line.type === diffParser.LINE_TYPE.INSERTS && Boolean(oldLines.length)) { @@ -178,9 +180,10 @@ }); return fileHtml; - } + }; - function processLines(oldLines, newLines) { + SideBySidePrinter.prototype.processLines = function(oldLines, newLines) { + var that = this; var fileHtml = {}; fileHtml.left = ''; fileHtml.right = ''; @@ -205,23 +208,23 @@ } if (oldLine && newLine) { - fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); - fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); + fileHtml.left += that.generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); + fileHtml.right += that.generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); } else if (oldLine) { - fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); - fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.left += that.generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); + fileHtml.right += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); } else if (newLine) { - fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); - fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); + fileHtml.left += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.right += that.generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); } else { console.error('How did it get here?'); } } return fileHtml; - } + }; - function generateSingleLineHtml(type, number, content, prefix) { + SideBySidePrinter.prototype.generateSingleLineHtml = function(type, number, content, prefix) { var htmlPrefix = ''; if (prefix) { htmlPrefix = '' + prefix + ''; @@ -238,9 +241,9 @@ '
' + htmlPrefix + htmlContent + '
' + ' \n' + ' \n'; - } + }; - function generateEmptyDiff() { + SideBySidePrinter.prototype.generateEmptyDiff = function() { var fileHtml = {}; fileHtml.right = ''; @@ -253,7 +256,7 @@ '\n'; return fileHtml; - } + }; module.exports.SideBySidePrinter = new SideBySidePrinter();