diff --git a/diff2html.css b/diff2html.css
new file mode 100644
index 0000000..d75dccc
--- /dev/null
+++ b/diff2html.css
@@ -0,0 +1,185 @@
+/*
+ *
+ * Diff to HTML (diff2html.css)
+ * Author: rtfpessoa
+ * Date: Friday 29 August 2014
+ * Last Update: Saturday 6 September 2014
+ *
+ */
+
+.d2h-wrapper {
+ display: block;
+ margin: 0 auto;
+ text-align: left;
+ width: 100%;
+}
+
+.d2h-file-wrapper {
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ margin-bottom: 1em;
+}
+
+.d2h-file-header {
+ padding: 5px 10px;
+ border-bottom: 1px solid #d8d8d8;
+ background-color: #f7f7f7;
+ font: 13px Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+.d2h-file-stats {
+ display: inline;
+ font-size: 12px;
+ text-align: center;
+ max-width: 15%;
+}
+
+.d2h-lines-added {
+ background-color: #ceffce;
+ border: 1px solid #b4e2b4;
+ color: #399839;
+ border-radius: 5px 0 0 5px;
+ padding: 2px;
+ width: 25px;
+}
+
+.d2h-lines-deleted {
+ background-color: #f7c8c8;
+ border: 1px solid #e9aeae;
+ color: #c33;
+ border-radius: 0 5px 5px 0;
+ padding: 2px;
+ width: 25px;
+}
+
+.d2h-file-name {
+ display: inline;
+ height: 33px;
+ line-height: 33px;
+ max-width: 80%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.d2h-diff-table {
+ border-collapse: collapse;
+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+ font-size: 12px;
+ height: 18px;
+ line-height: 18px;
+ width: 100%;
+}
+
+.d2h-files-diff {
+ width: 100%;
+}
+
+.d2h-file-diff {
+ overflow-x: scroll;
+}
+
+.d2h-file-side-diff {
+ display: inline-block;
+ overflow-x: scroll;
+ width: 50%;
+ margin-right: -4px;
+}
+
+.d2h-code-line {
+ white-space: pre;
+ padding-left: 10px;
+ padding-right: 10px;
+ height: 18px;
+ line-height: 18px;
+ margin-left: 80px;
+}
+
+.d2h-code-side-line {
+ white-space: pre;
+ padding-left: 10px;
+ padding-right: 10px;
+ height: 18px;
+ line-height: 18px;
+ margin-left: 50px;
+}
+
+.d2h-code-line del,
+.d2h-code-side-line del {
+ display: inline-block;
+ margin-top: -1px;
+ text-decoration: none;
+ background-color: #f99;
+ font-weight: 700;
+ border-radius: 0.2em;
+}
+
+.d2h-code-line ins,
+.d2h-code-side-line ins {
+ display: inline-block;
+ margin-top: -1px;
+ text-decoration: none;
+ background-color: #6f7;
+ font-weight: 700;
+ border-radius: 0.2em;
+}
+
+.line-num1 {
+ display: inline-block;
+ float: left;
+ width: 30px;
+}
+
+.line-num2 {
+ display: inline-block;
+ float: right;
+ width: 30px;
+}
+
+.d2h-code-linenumber {
+ position: absolute;
+ width: 2%;
+ min-width: 65px;
+ padding-left: 10px;
+ padding-right: 10px;
+ height: 18px;
+ line-height: 18px;
+ background-color: #fff;
+ color: rgba(0, 0, 0, 0.3);
+ text-align: right;
+ border: solid #eeeeee;
+ border-width: 0 1px 0 1px;
+ cursor: pointer;
+}
+
+.d2h-code-side-linenumber {
+ position: absolute;
+ width: 2%;
+ min-width: 35px;
+ padding-left: 10px;
+ padding-right: 10px;
+ height: 18px;
+ line-height: 18px;
+ background-color: #fff;
+ color: rgba(0, 0, 0, 0.3);
+ text-align: right;
+ border: solid #eeeeee;
+ border-width: 0 1px 0 1px;
+ cursor: pointer;
+}
+
+.d2h-del {
+ background-color: #f7c8c8;
+ border-color: #e9aeae;
+}
+
+.d2h-ins {
+ background-color: #ceffce;
+ border-color: #b4e2b4;
+}
+
+.d2h-info {
+ background-color: #f8fafd;
+ color: rgba(0, 0, 0, 0.3);
+ border-color: #d5e4f2;
+}
diff --git a/diff2html.js b/diff2html.js
new file mode 100644
index 0000000..6e13907
--- /dev/null
+++ b/diff2html.js
@@ -0,0 +1,586 @@
+/*
+ *
+ * Diff to HTML (diff2html.js)
+ * Author: rtfpessoa
+ * Date: Friday 29 August 2014
+ * Last Update: Saturday 6 September 2014
+ *
+ * Diff command:
+ * git diff --word-diff-regex=. HEAD~1
+ */
+
+(function (window) {
+ var ClassVariable;
+
+ ClassVariable = (function () {
+
+ var LINE_TYPE = {
+ INSERTS: "d2h-ins",
+ ALL_NEW: "d2h-all-ins",
+
+ DELETES: "d2h-del",
+ ALL_DELETED: "d2h-all-del",
+
+ INSERTS_AND_DELETES: "d2h-ins-and-del",
+ CONTEXT: "d2h-cntx",
+
+ INFO: "d2h-info"
+ };
+
+ function Diff2Html() {
+ }
+
+ /*
+ * Generates pretty html from string diff input
+ */
+ Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
+ var diffJson = generateDiffJson(diffInput);
+ return generateJsonHtml(diffJson);
+ };
+
+ /*
+ * Generates json object from string diff input
+ */
+ Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
+ return generateDiffJson(diffInput);
+ };
+
+ /*
+ * Generates pretty html from a json object
+ */
+ Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
+ return generateJsonHtml(diffJson);
+ };
+
+ /*
+ * Generates pretty side by side html from a json object
+ */
+ Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
+ return generateSideBySideJsonHtml(diffJson);
+ };
+
+ var generateDiffJson = function (diffInput) {
+ var files = [],
+ currentFile = null,
+ currentBlock = null,
+ oldLine = null,
+ newLine = null;
+
+ var saveBlock = function () {
+ /* add previous block(if exists) before start a new file */
+ if (currentBlock) {
+ currentFile.blocks.push(currentBlock);
+ currentBlock = null;
+ }
+ };
+
+ var saveFile = function () {
+ /* add previous file(if exists) before start a new one */
+ if (currentFile) {
+ files.push(currentFile);
+ currentFile = null;
+ }
+ };
+
+ var startFile = function (line) {
+ saveBlock();
+ saveFile();
+
+ /* create file structure */
+ currentFile = {};
+ currentFile.blocks = [];
+ currentFile.deletedLines = 0;
+ currentFile.addedLines = 0;
+
+ /* save file paths, before and after the diff */
+ var values = /^diff --git a\/(\S+) b\/(\S+).*$/.exec(line);
+ currentFile.oldName = values[1];
+ currentFile.newName = values[2];
+ };
+
+ var startBlock = function (line) {
+ saveBlock();
+
+ var values;
+ if (values = /^(@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*/.exec(line)) {
+ oldLine = values[2];
+ newLine = values[4];
+ } else {
+ oldLine = 0;
+ newLine = 0;
+ }
+
+ /* create block metadata */
+ currentBlock = {};
+ currentBlock.lines = [];
+ currentBlock.oldStartLine = oldLine;
+ currentBlock.newStartLine = newLine;
+ currentBlock.header = line;
+ };
+
+ var createLine = function (line) {
+ /* Line Types */
+ var isLineWithInserts = /{\+.*?\+}/.exec(line);
+ var isNewLine = /^{\+.*?\+}$/.exec(line);
+
+ var isLineWithDeletes = /\[-.*?-\]/.exec(line);
+ var isRemovedLine = /^\[-.*?-\]$/.exec(line);
+
+ var isLineWithBoth = isLineWithInserts && isLineWithDeletes;
+ var isContextLine = !isLineWithInserts && !isLineWithDeletes;
+
+ var currentLine = {};
+ currentLine.content = line;
+
+ /* fill the line data */
+ if (isLineWithBoth) {
+ currentFile.deletedLines++;
+ currentFile.addedLines++;
+
+ currentLine.type = LINE_TYPE.INSERTS_AND_DELETES;
+ currentLine.oldNumber = oldLine++;
+ currentLine.newNumber = newLine++;
+
+ currentBlock.lines.push(currentLine);
+
+ } else if (isContextLine) {
+
+ currentLine.type = LINE_TYPE.CONTEXT;
+ currentLine.oldNumber = oldLine++;
+ currentLine.newNumber = newLine++;
+
+ currentBlock.lines.push(currentLine);
+
+ } else if (isNewLine) {
+ currentFile.addedLines++;
+
+ currentLine.type = LINE_TYPE.ALL_NEW;
+ currentLine.oldNumber = null;
+ currentLine.newNumber = newLine++;
+
+ currentBlock.lines.push(currentLine);
+
+ } else if (isRemovedLine) {
+ currentFile.deletedLines++;
+
+ currentLine.type = LINE_TYPE.ALL_DELETED;
+ currentLine.oldNumber = oldLine++;
+ currentLine.newNumber = null;
+
+ currentBlock.lines.push(currentLine);
+
+ } else if (isLineWithInserts) {
+ currentFile.addedLines++;
+
+ currentLine.type = LINE_TYPE.INSERTS;
+ currentLine.oldNumber = oldLine++;
+ currentLine.newNumber = newLine++;
+
+ currentBlock.lines.push(currentLine);
+
+ } else if (isLineWithDeletes) {
+ currentFile.deletedLines++;
+
+ currentLine.type = LINE_TYPE.DELETES;
+ currentLine.oldNumber = oldLine++;
+ currentLine.newNumber = newLine++;
+
+ currentBlock.lines.push(currentLine);
+
+ }
+ };
+
+ var diffLines = diffInput.split("\n");
+ diffLines.forEach(function (line) {
+ // Unmerged paths, and possibly other non-diffable files
+ // https://github.com/scottgonzalez/pretty-diff/issues/11
+ // Also, remove some useless lines
+ if (!line || startsWith(line, "*") ||
+ startsWith(line, "new") || startsWith(line, "index") ||
+ startsWith(line, "---") || startsWith(line, "+++")) {
+ return;
+ }
+
+ if (startsWith(line, "diff")) {
+ startFile(line);
+ } else if (currentFile && startsWith(line, "@@")) {
+ startBlock(line);
+ } else if (currentBlock) {
+ createLine(line);
+ }
+ });
+
+ saveBlock();
+ saveFile();
+
+ return files;
+ };
+
+ /*
+ * Line By Line HTML
+ */
+
+ var generateJsonHtml = function (diffFiles) {
+ return "\n" +
+ diffFiles.map(function (file) {
+ return "
\n" +
+ " \n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ " \n" +
+ " " + generateFileHtml(file) +
+ " \n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n";
+ }).join("\n") +
+ "
\n" +
+ " | \n" +
+ " " +
+ " " + escape(block.header) + " " +
+ " | \n" +
+ "
\n" +
+
+ block.lines.map(function (line) {
+
+ var newLine = function () {
+ var lineData = {};
+ lineData.oldLine = valueOrEmpty(line.oldNumber);
+ lineData.newLine = valueOrEmpty(line.newNumber);
+
+ return lineData;
+ };
+
+ var escapedLine = escape(line.content);
+
+ var lines = [];
+ var lineData = {};
+
+ switch (line.type) {
+ case LINE_TYPE.INSERTS:
+ case LINE_TYPE.ALL_NEW:
+ lineData = newLine();
+ lineData.content = generateLineInsertions(escapedLine);
+ lineData.type = LINE_TYPE.INSERTS;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.DELETES:
+ case LINE_TYPE.ALL_DELETED:
+ lineData = newLine();
+ lineData.content = generateLineDeletions(escapedLine);
+ lineData.type = LINE_TYPE.DELETES;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.INSERTS_AND_DELETES:
+ lineData = newLine();
+ lineData.content = generateLineDeletions(escapedLine);
+ lineData.type = LINE_TYPE.DELETES;
+ lines.push(lineData);
+
+ lineData = newLine();
+ lineData.content = generateLineInsertions(escapedLine);
+ lineData.type = LINE_TYPE.INSERTS;
+ lines.push(lineData);
+ break;
+ default:
+ lineData = newLine();
+ lineData.content = escapedLine;
+ lineData.type = LINE_TYPE.CONTEXT;
+ lines.push(lineData);
+ break;
+ }
+
+ return lines.map(generateLineHtml).join("\n");
+ }).join("\n");
+ }).join("\n");
+ };
+
+ var generateLineHtml = function (line) {
+ return "\n" +
+ " | " +
+ " " + line.oldLine + " " +
+ " " + line.newLine + " " +
+ " | \n" +
+ " " +
+ " " + line.content + " " +
+ " | \n" +
+ "
\n";
+ };
+
+ /*
+ * Side By Side HTML (work in progress)
+ */
+
+ var generateSideBySideJsonHtml = function (diffFiles) {
+ return "\n" +
+ diffFiles.map(function (file) {
+ return "
\n" +
+ " \n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ " \n" +
+ " " + generateLeftSideFileHtml(file) +
+ " \n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ " \n" +
+ " " + generateRightSideFileHtml(file) +
+ " \n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n" +
+ "
\n";
+ }).join("\n") +
+ "
\n" +
+ " | \n" +
+ " " +
+ " " + escape(block.header) + " " +
+ " | \n" +
+ "
\n" +
+
+ block.lines.map(function (line) {
+
+ var emptyLine = function () {
+ var lineData = {};
+ lineData.number = "";
+ lineData.content = "";
+ lineData.type = LINE_TYPE.CONTEXT;
+
+ return lineData;
+ };
+
+ var escapedLine = escape(line.content);
+
+ var lines = [];
+ var lineData = {};
+
+ switch (line.type) {
+ case LINE_TYPE.INSERTS:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.oldNumber);
+ lineData.content = removeInserts(escapedLine);
+ lineData.type = LINE_TYPE.CONTEXT;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.ALL_NEW:
+ lines.push(new emptyLine());
+ break;
+ case LINE_TYPE.DELETES:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.oldNumber);
+ lineData.content = generateLineDeletions(escapedLine);
+ lineData.type = LINE_TYPE.DELETES;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.ALL_DELETED:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.oldNumber);
+ lineData.content = generateLineDeletions(escapedLine);
+ lineData.type = LINE_TYPE.DELETES;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.INSERTS_AND_DELETES:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.oldNumber);
+ lineData.content = generateLineDeletions(escapedLine);
+ lineData.type = LINE_TYPE.DELETES;
+ lines.push(lineData);
+ break;
+ default:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.oldNumber);
+ lineData.content = escapedLine;
+ lineData.type = LINE_TYPE.CONTEXT;
+ lines.push(lineData);
+ break;
+ }
+
+ return "\n" + lines.map(generateSingleLineHtml).join("\n") + "
\n";
+ }).join("\n");
+ }).join("\n");
+ };
+
+ var generateRightSideFileHtml = function (file) {
+ return file.blocks.map(function (block) {
+
+ return "\n" +
+ " | \n" +
+ " " +
+ " " + escape(block.header) + " " +
+ " | \n" +
+ "
\n" +
+
+ block.lines.map(function (line) {
+
+ var emptyLine = function () {
+ var lineData = {};
+ lineData.number = "";
+ lineData.content = "";
+ lineData.type = LINE_TYPE.CONTEXT;
+
+ return lineData;
+ };
+
+ var escapedLine = escape(line.content);
+
+ var lines = [];
+ var lineData = {};
+
+ switch (line.type) {
+ case LINE_TYPE.INSERTS:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.newNumber);
+ lineData.content = generateLineInsertions(escapedLine);
+ lineData.type = LINE_TYPE.INSERTS;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.ALL_NEW:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.newNumber);
+ lineData.content = generateLineInsertions(escapedLine);
+ lineData.type = LINE_TYPE.INSERTS;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.DELETES:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.newNumber);
+ lineData.content = removeDeletes(escapedLine);
+ lineData.type = LINE_TYPE.CONTEXT;
+ lines.push(lineData);
+ break;
+ case LINE_TYPE.ALL_DELETED:
+ lines.push(new emptyLine());
+ break;
+ case LINE_TYPE.INSERTS_AND_DELETES:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.newNumber);
+ lineData.content = generateLineInsertions(escapedLine);
+ lineData.type = LINE_TYPE.INSERTS;
+ lines.push(lineData);
+ break;
+ default:
+ lineData = {};
+ lineData.number = valueOrEmpty(line.newNumber);
+ lineData.content = escapedLine;
+ lineData.type = LINE_TYPE.CONTEXT;
+ lines.push(lineData);
+ break;
+ }
+
+ return "\n" + lines.map(generateSingleLineHtml).join("\n") + "
\n";
+ }).join("\n");
+ }).join("\n");
+ };
+
+ var generateSingleLineHtml = function (line) {
+ return "" + line.number + " | \n" +
+ " " +
+ " " + line.content + " " +
+ " | \n";
+ };
+
+ /*
+ * HTML Helpers
+ */
+
+ var getDiffName = function (oldFilename, newFilename) {
+ return oldFilename === newFilename ? newFilename : oldFilename + " -> " + newFilename;
+ };
+
+ var generateLineInsertions = function (line) {
+ return line.slice(0).replace(/(\[-.*?-\])/g, "").
+ replace(/({\+(.*?)\+})/g, "$2");
+ };
+
+ var generateLineDeletions = function (line) {
+ return line.slice(0).replace(/({\+.*?\+})/g, "").
+ replace(/(\[-(.*?)-\])/g, "$2");
+ };
+
+ var removeDeletes = function (line) {
+ return line.slice(0).replace(/({\+.*?\+})/g, "").
+ replace(/(\[-.*?-\])/g, "");
+ };
+
+ var removeInserts = function (line) {
+ return line.slice(0).replace(/({\+.*?\+})/g, "").
+ replace(/(\[-.*?-\])/g, "");
+ };
+
+ var cleanLine = function (line) {
+ return line.slice(0).replace(/({\+(.*?)\+})/g, "$2").
+ replace(/(\[-(.*?)-\])/g, "$2");
+ };
+
+ /*
+ * Utils
+ */
+
+ function escape(str) {
+ return str.slice(0)
+ .replace(/&/g, "&")
+ .replace(//g, ">")
+ .replace(/\t/g, " ");
+ }
+
+ function startsWith(str, start) {
+ return str.indexOf(start) === 0;
+ }
+
+ function valueOrEmpty(value) {
+ return value ? value : "";
+ }
+
+ /* singleton pattern */
+ var instance;
+ return {
+ getInstance: function () {
+ if (instance === undefined) {
+ instance = new Diff2Html();
+ /* Hide the constructor so the returned objected can't be new'd */
+ instance.constructor = null;
+ }
+ return instance;
+ }
+ };
+
+ })();
+
+ window.Diff2Html = ClassVariable.getInstance();
+ return window.Diff2Html;
+
+})(window);
diff --git a/diff2html.min.css b/diff2html.min.css
index c17704e..de75cb7 100644
--- a/diff2html.min.css
+++ b/diff2html.min.css
@@ -1 +1 @@
-.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-file-diff{overflow-x:scroll}.d2h-code-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:80px}.d2h-code-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#f99;font-weight:700;border-radius:.2em}.d2h-code-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#6f7;font-weight:700;border-radius:.2em}.line-num1{display:inline-block;float:left;width:30px}.line-num2{display:inline-block;float:right;width:30px}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px 0 0;cursor:pointer}.d2h-code-linenumber:not(:first-child){border-width:0 1px}.d2h-del{background-color:#f7c8c8;border-color:#e9aeae}.d2h-ins{background-color:#ceffce;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,.3);border-color:#d5e4f2}
\ No newline at end of file
+.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;width:50%;margin-right:-4px}.d2h-code-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:80px}.d2h-code-side-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:50px}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#f99;font-weight:700;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#6f7;font-weight:700;border-radius:.2em}.line-num1{display:inline-block;float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{display:inline-block;float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#f7c8c8;border-color:#e9aeae}.d2h-ins{background-color:#ceffce;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,.3);border-color:#d5e4f2}
\ No newline at end of file
diff --git a/diff2html.min.js b/diff2html.min.js
index 9fb204e..476510a 100644
--- a/diff2html.min.js
+++ b/diff2html.min.js
@@ -1 +1 @@
-!function(window){var ClassVariable;return ClassVariable=function(){function Diff2Html(){}function escape(str){return str.slice(0).replace(/&/g,"&").replace(//g,">").replace(/\t/g," ")}function startsWith(str,start){return 0===str.indexOf(start)}function valueOrEmpty(value){return value?value:""}var LINE_TYPE={INSERTS:"d2h-ins",ALL_NEW:"d2h-all-ins",DELETES:"d2h-del",ALL_DELETED:"d2h-all-del",INSERTS_AND_DELETES:"d2h-ins-and-del",CONTEXT:"d2h-cntx",INFO:"d2h-info"};Diff2Html.prototype.getPrettyHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateJsonHtml(diffJson,generateFileHtml)},Diff2Html.prototype.getJsonFromDiff=function(diffInput){return generateDiffJson(diffInput)},Diff2Html.prototype.getPrettyHtmlFromJson=function(diffJson){return generateJsonHtml(diffJson,generateFileHtml)};var instance,generateDiffJson=function(diffInput){var files=[],currentFile=null,currentBlock=null,oldLine=null,newLine=null,saveBlock=function(){currentBlock&&(currentFile.blocks.push(currentBlock),currentBlock=null)},saveFile=function(){currentFile&&(files.push(currentFile),currentFile=null)},startFile=function(line){saveBlock(),saveFile(),currentFile={},currentFile.blocks=[],currentFile.deletedLines=0,currentFile.addedLines=0;var values=/^diff --git a\/(\S+) b\/(\S+).*$/.exec(line);currentFile.oldName=values[1],currentFile.newName=values[2]},startBlock=function(line){saveBlock();var values;(values=/^(@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*/.exec(line))?(oldLine=values[2],newLine=values[4]):(oldLine=0,newLine=0),currentBlock={},currentBlock.lines=[],currentBlock.oldStartLine=oldLine,currentBlock.newStartLine=newLine,currentBlock.header=line},createLine=function(line){var isLineWithInserts=/{\+.*?\+}/.exec(line),isNewLine=/^{\+.*?\+}$/.exec(line),isLineWithDeletes=/\[-.*?-\]/.exec(line),isRemovedLine=/^\[-.*?-\]$/.exec(line),isLineWithBoth=isLineWithInserts&&isLineWithDeletes,isContextLine=!isLineWithInserts&&!isLineWithDeletes,currentLine={};currentLine.content=line,isLineWithBoth?(currentFile.deletedLines++,currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS_AND_DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isContextLine?(currentLine.type=LINE_TYPE.CONTEXT,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isNewLine?(currentFile.addedLines++,currentLine.type=LINE_TYPE.ALL_NEW,currentLine.oldNumber=null,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isRemovedLine?(currentFile.deletedLines++,currentLine.type=LINE_TYPE.ALL_DELETED,currentLine.oldNumber=oldLine++,currentLine.newNumber=null,currentBlock.lines.push(currentLine)):isLineWithInserts?(currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isLineWithDeletes&&(currentFile.deletedLines++,currentLine.type=LINE_TYPE.DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine))},diffLines=diffInput.split("\n");return diffLines.forEach(function(line){!line||startsWith(line,"*")||startsWith(line,"new")||startsWith(line,"index")||startsWith(line,"---")||startsWith(line,"+++")||(startsWith(line,"diff")?startFile(line):currentFile&&startsWith(line,"@@")?startBlock(line):currentBlock&&createLine(line))}),saveBlock(),saveFile(),files},generateJsonHtml=function(diffFiles,htmlTypeFunction){return'\n'+diffFiles.map(function(file){return'
\n \n
\n
\n
\n \n '+htmlTypeFunction(file)+" \n
\n
\n
\n
\n"}).join("\n")+"
\n | \n '+escape(block.header)+" | \n
\n"+block.lines.map(function(line){var newLine=function(){var lineData={};return lineData.oldLine=valueOrEmpty(line.oldNumber),lineData.newLine=valueOrEmpty(line.newNumber),lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:case LINE_TYPE.ALL_NEW:lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.DELETES:case LINE_TYPE.ALL_DELETED:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData),lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;default:lineData=newLine(),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return lines.map(generateLineHtml).join("\n")}).join("\n")}).join("\n")},generateLineHtml=function(line){return'\n | '+line.oldLine+' '+line.newLine+' | \n '+line.content+" | \n
\n"},getDiffName=function(oldFilename,newFilename){return oldFilename===newFilename?newFilename:oldFilename+" -> "+newFilename},generateLineInsertions=function(line){return line.slice(0).replace(/(\[-.*?-\])/g,"").replace(/({\+(.*?)\+})/g,"$2")},generateLineDeletions=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-(.*?)-\])/g,"$2")};return{getInstance:function(){return void 0===instance&&(instance=new Diff2Html,instance.constructor=null),instance}}}(),window.Diff2Html=ClassVariable.getInstance(),window.Diff2Html}(window);
\ No newline at end of file
+!function(window){var ClassVariable;return ClassVariable=function(){function Diff2Html(){}function escape(str){return str.slice(0).replace(/&/g,"&").replace(//g,">").replace(/\t/g," ")}function startsWith(str,start){return 0===str.indexOf(start)}function valueOrEmpty(value){return value?value:""}var LINE_TYPE={INSERTS:"d2h-ins",ALL_NEW:"d2h-all-ins",DELETES:"d2h-del",ALL_DELETED:"d2h-all-del",INSERTS_AND_DELETES:"d2h-ins-and-del",CONTEXT:"d2h-cntx",INFO:"d2h-info"};Diff2Html.prototype.getPrettyHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateJsonHtml(diffJson)},Diff2Html.prototype.getJsonFromDiff=function(diffInput){return generateDiffJson(diffInput)},Diff2Html.prototype.getPrettyHtmlFromJson=function(diffJson){return generateJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateSideBySideJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromJson=function(diffJson){return generateSideBySideJsonHtml(diffJson)};var instance,generateDiffJson=function(diffInput){var files=[],currentFile=null,currentBlock=null,oldLine=null,newLine=null,saveBlock=function(){currentBlock&&(currentFile.blocks.push(currentBlock),currentBlock=null)},saveFile=function(){currentFile&&(files.push(currentFile),currentFile=null)},startFile=function(line){saveBlock(),saveFile(),currentFile={},currentFile.blocks=[],currentFile.deletedLines=0,currentFile.addedLines=0;var values=/^diff --git a\/(\S+) b\/(\S+).*$/.exec(line);currentFile.oldName=values[1],currentFile.newName=values[2]},startBlock=function(line){saveBlock();var values;(values=/^(@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*/.exec(line))?(oldLine=values[2],newLine=values[4]):(oldLine=0,newLine=0),currentBlock={},currentBlock.lines=[],currentBlock.oldStartLine=oldLine,currentBlock.newStartLine=newLine,currentBlock.header=line},createLine=function(line){var isLineWithInserts=/{\+.*?\+}/.exec(line),isNewLine=/^{\+.*?\+}$/.exec(line),isLineWithDeletes=/\[-.*?-\]/.exec(line),isRemovedLine=/^\[-.*?-\]$/.exec(line),isLineWithBoth=isLineWithInserts&&isLineWithDeletes,isContextLine=!isLineWithInserts&&!isLineWithDeletes,currentLine={};currentLine.content=line,isLineWithBoth?(currentFile.deletedLines++,currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS_AND_DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isContextLine?(currentLine.type=LINE_TYPE.CONTEXT,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isNewLine?(currentFile.addedLines++,currentLine.type=LINE_TYPE.ALL_NEW,currentLine.oldNumber=null,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isRemovedLine?(currentFile.deletedLines++,currentLine.type=LINE_TYPE.ALL_DELETED,currentLine.oldNumber=oldLine++,currentLine.newNumber=null,currentBlock.lines.push(currentLine)):isLineWithInserts?(currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isLineWithDeletes&&(currentFile.deletedLines++,currentLine.type=LINE_TYPE.DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine))},diffLines=diffInput.split("\n");return diffLines.forEach(function(line){!line||startsWith(line,"*")||startsWith(line,"new")||startsWith(line,"index")||startsWith(line,"---")||startsWith(line,"+++")||(startsWith(line,"diff")?startFile(line):currentFile&&startsWith(line,"@@")?startBlock(line):currentBlock&&createLine(line))}),saveBlock(),saveFile(),files},generateJsonHtml=function(diffFiles){return'\n'+diffFiles.map(function(file){return'
\n \n
\n
\n
\n \n '+generateFileHtml(file)+" \n
\n
\n
\n
\n"}).join("\n")+"
\n | \n '+escape(block.header)+" | \n
\n"+block.lines.map(function(line){var newLine=function(){var lineData={};return lineData.oldLine=valueOrEmpty(line.oldNumber),lineData.newLine=valueOrEmpty(line.newNumber),lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:case LINE_TYPE.ALL_NEW:lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.DELETES:case LINE_TYPE.ALL_DELETED:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData),lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;default:lineData=newLine(),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return lines.map(generateLineHtml).join("\n")}).join("\n")}).join("\n")},generateLineHtml=function(line){return'\n | '+line.oldLine+' '+line.newLine+' | \n '+line.content+" | \n
\n"},generateSideBySideJsonHtml=function(diffFiles){return'\n'+diffFiles.map(function(file){return'
\n \n
\n
\n
\n
\n \n '+generateLeftSideFileHtml(file)+' \n
\n
\n
\n
\n
\n
\n \n '+generateRightSideFileHtml(file)+" \n
\n
\n
\n
\n
\n"}).join("\n")+"
\n | \n '+escape(block.header)+" | \n
\n"+block.lines.map(function(line){var emptyLine=function(){var lineData={};return lineData.number="",lineData.content="",lineData.type=LINE_TYPE.CONTEXT,lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=removeInserts(escapedLine),lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData);break;case LINE_TYPE.ALL_NEW:lines.push(new emptyLine);break;case LINE_TYPE.DELETES:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.ALL_DELETED:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;default:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return"\n"+lines.map(generateSingleLineHtml).join("\n")+"
\n"}).join("\n")}).join("\n")},generateRightSideFileHtml=function(file){return file.blocks.map(function(block){return'\n | \n | \n
\n'+block.lines.map(function(line){var emptyLine=function(){var lineData={};return lineData.number="",lineData.content="",lineData.type=LINE_TYPE.CONTEXT,lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.ALL_NEW:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.DELETES:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=removeDeletes(escapedLine),lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData);break;case LINE_TYPE.ALL_DELETED:lines.push(new emptyLine);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;default:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return"\n"+lines.map(generateSingleLineHtml).join("\n")+"
\n"}).join("\n")}).join("\n")},generateSingleLineHtml=function(line){return''+line.number+' | \n '+line.content+" | \n"},getDiffName=function(oldFilename,newFilename){return oldFilename===newFilename?newFilename:oldFilename+" -> "+newFilename},generateLineInsertions=function(line){return line.slice(0).replace(/(\[-.*?-\])/g,"").replace(/({\+(.*?)\+})/g,"$2")},generateLineDeletions=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-(.*?)-\])/g,"$2")},removeDeletes=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-.*?-\])/g,"")},removeInserts=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-.*?-\])/g,"")};return{getInstance:function(){return void 0===instance&&(instance=new Diff2Html,instance.constructor=null),instance}}}(),window.Diff2Html=ClassVariable.getInstance(),window.Diff2Html}(window);
\ No newline at end of file
diff --git a/index.html b/index.html
index 681f758..65f430d 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
Diff to HTML (template.html)
Author: rtfpessoa
Date: Friday 29 August 2014
- Last Update: Saturday 6 September 2014
+ Last Update: Sunday 14 September 2014
-->
@@ -63,6 +63,8 @@
var diffJson = Diff2Html.getJsonFromDiff(exInput);
var lineByLineDiffHtml = Diff2Html.getPrettyHtmlFromJson(diffJson);
document.getElementById('line-by-line').innerHTML = lineByLineDiffHtml;
+ var sideBySideDiffHtml = Diff2Html.getPrettySideBySideHtmlFromJson(diffJson);
+ document.getElementById('side-by-side').innerHTML = sideBySideDiffHtml;
}
@@ -72,7 +74,12 @@
Line by Line
-