compatibility with node code

diff2html.js

@@ -1,51 +0,0 @@
-/*
- *
- * Diff to HTML (diff2html.js)
- * Author: rtfpessoa
- *
- * Diff commands:
- *   git diff
- */
-
-var diffParser = new DiffParser();
-var htmlPrinter = new HtmlPrinter();
-
-function Diff2Html() {
-}
-
-/*
- * Generates pretty html from string diff input
- */
-Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
-  var diffJson = diffParser.generateDiffJson(diffInput);
-  return htmlPrinter.generateLineByLineJsonHtml(diffJson);
-};
-
-/*
- * Generates json object from string diff input
- */
-Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
-  return diffParser.generateDiffJson(diffInput);
-};
-
-/*
- * Generates pretty html from a json object
- */
-Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
-  return htmlPrinter.generateLineByLineJsonHtml(diffJson);
-};
-
-/*
- * Generates pretty side by side html from string diff input
- */
-Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
-  var diffJson = diffParser.generateDiffJson(diffInput);
-  return htmlPrinter.generateSideBySideJsonHtml(diffJson);
-};
-
-/*
- * Generates pretty side by side html from a json object
- */
-Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
-  return htmlPrinter.generateSideBySideJsonHtml(diffJson);
-};

index.html

@@ -7,8 +7,6 @@
     <!--
         Diff to HTML (template.html)
         Author: rtfpessoa
-        Date: Friday 29 August 2014
-        Last Update: Sunday 2 February 2015
     -->
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
@@ -16,8 +14,8 @@
 
     <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
 
-    <!--<script type="text/javascript" src="lib/jsdiff.js"></script>-->
     <script type="text/javascript" src="lib/diff.js"></script>
+    <script type="text/javascript" src="lib/fakeRequire.js"></script>
 
     <script type="text/javascript" src="src/utils.js"></script>
     <script type="text/javascript" src="src/diff-parser.js"></script>
@@ -25,7 +23,7 @@
     <script type="text/javascript" src="src/side-by-side-printer.js"></script>
     <script type="text/javascript" src="src/line-by-line-printer.js"></script>
     <script type="text/javascript" src="src/html-printer.js"></script>
-    <script type="text/javascript" src="diff2html.js"></script>
+    <script type="text/javascript" src="src/diff2html.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
     <script>
@@ -188,7 +186,7 @@
                 '-});\n';
 
         $(document).ready(function () {
-            var diff2Html = new Diff2Html();
+            var diff2Html = Diff2Html;
             var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
 
             var languages = diffJson.map(function (line) {

lib/fakeRequire.js

@@ -0,0 +1,4 @@
+var global = this;
+function require() {
+  return global;
+}

lib/jsdiff.js

@@ -1,101 +0,0 @@
-/*
- * Javascript Diff Algorithm
- *  By John Resig (http://ejohn.org/)
- *  Modified by Chu Alan "sprite"
- *  Modified by Rodrigo Fernandes "rtfpessoa"
- *
- * Released under the MIT license.
- *
- * More Info:
- *  http://ejohn.org/projects/javascript-diff-algorithm/
- */
-
-function JsDiff(o, n) {
-    o = o.replace(/\s+$/, '');
-    n = n.replace(/\s+$/, '');
-
-    var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
-    var str = "";
-
-    var oSpace = o.match(/\s+/g);
-    if (oSpace == null) {
-        oSpace = ["\n"];
-    } else {
-        oSpace.push("\n");
-    }
-    var nSpace = n.match(/\s+/g);
-    if (nSpace == null) {
-        nSpace = ["\n"];
-    } else {
-        nSpace.push("\n");
-    }
-
-    if (out.n.length == 0) {
-        for (var i = 0; i < out.o.length; i++) {
-            str += '<del>' + out.o[i] + oSpace[i] + "</del>";
-        }
-    } else {
-        if (out.n[0].text == null) {
-            for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
-                str += '<del>' + out.o[n] + oSpace[n] + "</del>";
-            }
-        }
-
-        for (var i = 0; i < out.n.length; i++) {
-            if (out.n[i].text == null) {
-                str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
-            } else {
-                var pre = "";
-
-                for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
-                    pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
-                }
-                str += " " + out.n[i].text + nSpace[i] + pre;
-            }
-        }
-    }
-
-    return str;
-}
-
-function diff(o, n) {
-    var ns = new Object();
-    var os = new Object();
-
-    for (var i = 0; i < n.length; i++) {
-        if (ns[n[i]] == null)
-            ns[n[i]] = {rows: new Array(), o: null};
-        ns[n[i]].rows.push(i);
-    }
-
-    for (var i = 0; i < o.length; i++) {
-        if (os[o[i]] == null)
-            os[o[i]] = {rows: new Array(), n: null};
-        os[o[i]].rows.push(i);
-    }
-
-    for (var i in ns) {
-        if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
-            n[ns[i].rows[0]] = {text: n[ns[i].rows[0]], row: os[i].rows[0]};
-            o[os[i].rows[0]] = {text: o[os[i].rows[0]], row: ns[i].rows[0]};
-        }
-    }
-
-    for (var i = 0; i < n.length - 1; i++) {
-        if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
-          n[i + 1] == o[n[i].row + 1]) {
-            n[i + 1] = {text: n[i + 1], row: n[i].row + 1};
-            o[n[i].row + 1] = {text: o[n[i].row + 1], row: i + 1};
-        }
-    }
-
-    for (var i = n.length - 1; i > 0; i--) {
-        if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
-          n[i - 1] == o[n[i].row - 1]) {
-            n[i - 1] = {text: n[i - 1], row: n[i].row - 1};
-            o[n[i].row - 1] = {text: o[n[i].row - 1], row: i - 1};
-        }
-    }
-
-    return {o: o, n: n};
-}

src/diff-parser.js

@@ -5,21 +5,23 @@
  *
  */
 
-var utils = new Utils();
+(function (global, undefined) {
 
-var LINE_TYPE = {
+  var utils = require("./utils.js").Utils;
+
+  var LINE_TYPE = {
     INSERTS: "d2h-ins",
     DELETES: "d2h-del",
     CONTEXT: "d2h-cntx",
     INFO: "d2h-info"
-};
+  };
 
-function DiffParser() {
+  function DiffParser() {
-}
+  }
 
-DiffParser.prototype.LINE_TYPE = LINE_TYPE;
+  DiffParser.prototype.LINE_TYPE = LINE_TYPE;
 
-DiffParser.prototype.generateDiffJson = function (diffInput) {
+  DiffParser.prototype.generateDiffJson = function (diffInput) {
     var files = [],
       currentFile = null,
       currentBlock = null,
@@ -144,4 +146,12 @@ DiffParser.prototype.generateDiffJson = function (diffInput) {
     saveFile();
 
     return files;
-};
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.DiffParser = new DiffParser();
+  } else if (typeof global.DiffParser === 'undefined') {
+    global.DiffParser = new DiffParser();
+  }
+
+})(this);

src/diff2html.js

@@ -0,0 +1,61 @@
+/*
+ *
+ * Diff to HTML (diff2html.js)
+ * Author: rtfpessoa
+ *
+ * Diff commands:
+ *   git diff
+ */
+
+(function (global, undefined) {
+
+  var diffParser = require("./diff-parser.js").DiffParser;
+  var htmlPrinter = require("./html-printer.js").HtmlPrinter;
+
+  function Diff2Html() {
+  }
+
+  /*
+   * Generates pretty html from string diff input
+   */
+  Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
+    var diffJson = diffParser.generateDiffJson(diffInput);
+    return htmlPrinter.generateLineByLineJsonHtml(diffJson);
+  };
+
+  /*
+   * Generates json object from string diff input
+   */
+  Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
+    return diffParser.generateDiffJson(diffInput);
+  };
+
+  /*
+   * Generates pretty html from a json object
+   */
+  Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
+    return htmlPrinter.generateLineByLineJsonHtml(diffJson);
+  };
+
+  /*
+   * Generates pretty side by side html from string diff input
+   */
+  Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
+    var diffJson = diffParser.generateDiffJson(diffInput);
+    return htmlPrinter.generateSideBySideJsonHtml(diffJson);
+  };
+
+  /*
+   * Generates pretty side by side html from a json object
+   */
+  Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
+    return htmlPrinter.generateSideBySideJsonHtml(diffJson);
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.Diff2Html = new Diff2Html();
+  } else if (typeof global.Diff2Html === 'undefined') {
+    global.Diff2Html = new Diff2Html();
+  }
+
+})(this);

src/html-printer.js

@@ -5,12 +5,22 @@
  *
  */
 
-var lineByLinePrinter = new LineByLinePrinter();
+(function (global, undefined) {
-var sideBySidePrinter = new SideBySidePrinter();
 
-function HtmlPrinter() {
+  var lineByLinePrinter = require("./line-by-line-printer.js").LineByLinePrinter;
-}
+  var sideBySidePrinter = require("./side-by-side-printer.js").SideBySidePrinter;
 
-HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
+  function HtmlPrinter() {
+  }
 
-HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
+  HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
+
+  HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.HtmlPrinter = new HtmlPrinter();
+  } else if (typeof global.HtmlPrinter === 'undefined') {
+    global.HtmlPrinter = new HtmlPrinter();
+  }
+
+})(this);

src/line-by-line-printer.js

@@ -5,14 +5,16 @@
  *
  */
 
-var diffParser = new DiffParser();
+(function (global, undefined) {
-var printerUtils = new PrinterUtils();
-var utils = new Utils();
 
-function LineByLinePrinter() {
+  var diffParser = require("./diff-parser.js").DiffParser;
-}
+  var printerUtils = require("./printer-utils.js").PrinterUtils;
+  var utils = require("./utils.js").Utils;
 
-LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles) {
+  function LineByLinePrinter() {
+  }
+
+  LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles) {
     return "<div class=\"d2h-wrapper\">\n" +
       diffFiles.map(function (file) {
         return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
@@ -35,9 +37,9 @@ LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles) {
           "   </div>\n";
       }).join("\n") +
       "</div>\n";
-};
+  };
 
-function generateFileHtml(file) {
+  function generateFileHtml(file) {
     return file.blocks.map(function (block) {
 
       var lines = "<tr>\n" +
@@ -105,9 +107,9 @@ function generateFileHtml(file) {
 
       return lines;
     }).join("\n");
-}
+  }
 
-function generateLineHtml(type, oldNumber, newNumber, content) {
+  function generateLineHtml(type, oldNumber, newNumber, content) {
     return "<tr>\n" +
       "  <td class=\"d2h-code-linenumber " + type + "\">" +
       "    <div class=\"line-num1\">" + utils.valueOrEmpty(oldNumber) + "</div>" +
@@ -117,4 +119,12 @@ function generateLineHtml(type, oldNumber, newNumber, content) {
       "    <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
       "  </td>\n" +
       "</tr>\n";
-}
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.LineByLinePrinter = new LineByLinePrinter();
+  } else if (typeof global.LineByLinePrinter === 'undefined') {
+    global.LineByLinePrinter = new LineByLinePrinter();
+  }
+
+})(this);

src/printer-utils.js

@@ -5,12 +5,15 @@
  *
  */
 
-var jsDiff = JsDiff;
+(function (global, undefined) {
 
-function PrinterUtils() {
+  // dirty hack for browser compatibility
-}
+  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
 
-PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
+  function PrinterUtils() {
+  }
+
+  PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
     if (oldFilename && newFilename && oldFilename !== newFilename) {
       return oldFilename + " -> " + newFilename;
     } else if (newFilename) {
@@ -20,9 +23,9 @@ PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
     } else {
       return "Unknown filename";
     }
-};
+  };
 
-PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, isTripleDiff) {
+  PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, isTripleDiff) {
     var lineStart1, lineStart2;
 
     var prefixSize = 1;
@@ -50,12 +53,20 @@ PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, isTripleD
       o: lineStart1 + removeIns(highlightedLine),
       n: lineStart2 + removeDel(highlightedLine)
     }
-};
+  };
 
-function removeIns(line) {
+  function removeIns(line) {
     return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
-}
+  }
 
-function removeDel(line) {
+  function removeDel(line) {
     return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
-}
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.PrinterUtils = new PrinterUtils();
+  } else if (typeof global.PrinterUtils === 'undefined') {
+    global.PrinterUtils = new PrinterUtils();
+  }
+
+})(this);

src/side-by-side-printer.js

@@ -5,14 +5,16 @@
  *
  */
 
-var diffParser = new DiffParser();
+(function (global, undefined) {
-var printerUtils = new PrinterUtils();
-var utils = new Utils();
 
-function SideBySidePrinter() {
+  var diffParser = require("./diff-parser.js").DiffParser;
-}
+  var printerUtils = require("./printer-utils.js").PrinterUtils;
+  var utils = require("./utils.js").Utils;
 
-SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles) {
+  function SideBySidePrinter() {
+  }
+
+  SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles) {
     return "<div class=\"d2h-wrapper\">\n" +
       diffFiles.map(function (file) {
         var diffs = generateSideBySideFileHtml(file);
@@ -48,9 +50,9 @@ SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles) {
           "   </div>\n";
       }).join("\n") +
       "</div>\n";
-};
+  };
 
-function generateSideBySideFileHtml(file) {
+  function generateSideBySideFileHtml(file) {
     var fileHtml = {};
     fileHtml.left = "";
     fileHtml.right = "";
@@ -133,13 +135,21 @@ function generateSideBySideFileHtml(file) {
     });
 
     return fileHtml;
-}
+  }
 
-function generateSingleLineHtml(type, number, content) {
+  function generateSingleLineHtml(type, number, content) {
     return "<tr>\n" +
       "    <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
       "    <td class=\"" + type + "\">" +
       "      <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
       "    </td>\n" +
       "  </tr>\n";
-}
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.SideBySidePrinter = new SideBySidePrinter();
+  } else if (typeof global.SideBySidePrinter === 'undefined') {
+    global.SideBySidePrinter = new SideBySidePrinter();
+  }
+
+})(this);

src/utils.js

@@ -5,21 +5,31 @@
  *
  */
 
-function Utils() {
+(function (global, undefined) {
-}
 
-Utils.prototype.escape = function (str) {
+  function Utils() {
+  }
+
+  Utils.prototype.escape = function (str) {
     return str.slice(0)
       .replace(/&/g, "&")
       .replace(/</g, "&lt;")
       .replace(/>/g, "&gt;")
       .replace(/\t/g, "    ");
-};
+  };
 
-Utils.prototype.startsWith = function (str, start) {
+  Utils.prototype.startsWith = function (str, start) {
     return str.indexOf(start) === 0;
-};
+  };
 
-Utils.prototype.valueOrEmpty = function (value) {
+  Utils.prototype.valueOrEmpty = function (value) {
     return value ? value : "";
-};
+  };
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports.Utils = new Utils();
+  } else if (typeof global.Utils === 'undefined') {
+    global.Utils = new Utils();
+  }
+
+})(this);