update from nodejs cleanup

diff2html.css

@@ -2,8 +2,6 @@
  *
  * Diff to HTML (diff2html.css)
  * Author: rtfpessoa
- * Date: Friday 29 August 2014
- * Last Update: Friday 30 January 2015
  *
  */
 

diff2html.js

@@ -2,66 +2,59 @@
  *
  * Diff to HTML (diff2html.js)
  * Author: rtfpessoa
- * Date: Friday 29 August 2014
- * Last Update: Sunday 2 February 2015
  *
- * Diff command:
+ * Diff commands:
  *   git diff
  */
 
-(function (window) {
+var LINE_TYPE = {
-    var ClassVariable;
-
-    ClassVariable = (function () {
-
-        var LINE_TYPE = {
     INSERTS: "d2h-ins",
     DELETES: "d2h-del",
     CONTEXT: "d2h-cntx",
     INFO: "d2h-info"
-        };
+};
 
-        function Diff2Html() {
+function Diff2Html() {
-        }
+}
 
-        /*
+/*
  * Generates pretty html from string diff input
  */
-        Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
+Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
     var diffJson = generateDiffJson(diffInput);
     return generateJsonHtml(diffJson);
-        };
+};
 
-        /*
+/*
  * Generates json object from string diff input
  */
-        Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
+Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
     return generateDiffJson(diffInput);
-        };
+};
 
-        /*
+/*
  * Generates pretty html from a json object
  */
-        Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
+Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
     return generateJsonHtml(diffJson);
-        };
+};
 
-        /*
+/*
  * Generates pretty side by side html from string diff input
  */
-        Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
+Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
     var diffJson = generateDiffJson(diffInput);
     return generateSideBySideJsonHtml(diffJson);
-        };
+};
 
-        /*
+/*
  * Generates pretty side by side html from a json object
  */
-        Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
+Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
     return generateSideBySideJsonHtml(diffJson);
-        };
+};
 
-        var generateDiffJson = function (diffInput) {
+var generateDiffJson = function (diffInput) {
     var files = [],
       currentFile = null,
       currentBlock = null,
@@ -179,13 +172,13 @@
     saveFile();
 
     return files;
-        };
+};
 
-        /*
+/*
  * Line By Line HTML
  */
 
-        var generateJsonHtml = function (diffFiles) {
+var generateJsonHtml = function (diffFiles) {
     return "<div class=\"d2h-wrapper\">\n" +
       diffFiles.map(function (file) {
           return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
@@ -208,9 +201,9 @@
             "   </div>\n";
       }).join("\n") +
       "</div>\n";
-        };
+};
 
-        var generateFileHtml = function (file) {
+var generateFileHtml = function (file) {
     return file.blocks.map(function (block) {
 
         var lines = "<tr>\n" +
@@ -250,9 +243,9 @@
 
         return lines;
     }).join("\n");
-        };
+};
 
-        var generateLineHtml = function (type, oldNumber, newNumber, content) {
+var generateLineHtml = function (type, oldNumber, newNumber, content) {
     return "<tr>\n" +
       "  <td class=\"d2h-code-linenumber " + type + "\">" +
       "    <div class=\"line-num1\">" + valueOrEmpty(oldNumber) + "</div>" +
@@ -262,13 +255,13 @@
       "    <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
       "  </td>\n" +
       "</tr>\n";
-        };
+};
 
-        /*
+/*
  * Side By Side HTML (work in progress)
  */
 
-        var generateSideBySideJsonHtml = function (diffFiles) {
+var generateSideBySideJsonHtml = function (diffFiles) {
     return "<div class=\"d2h-wrapper\">\n" +
       diffFiles.map(function (file) {
           var diffs = generateSideBySideFileHtml(file);
@@ -304,9 +297,9 @@
             "   </div>\n";
       }).join("\n") +
       "</div>\n";
-        };
+};
 
-        var generateSideBySideFileHtml = function (file) {
+var generateSideBySideFileHtml = function (file) {
     var fileHtml = {};
     fileHtml.left = "";
     fileHtml.right = "";
@@ -363,22 +356,22 @@
     });
 
     return fileHtml;
-        };
+};
 
-        var generateSingleLineHtml = function (type, number, content) {
+var generateSingleLineHtml = function (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";
-        };
+};
 
-        /*
+/*
  * HTML Helpers
  */
 
-        var getDiffName = function (oldFilename, newFilename) {
+var getDiffName = function (oldFilename, newFilename) {
     if (oldFilename && newFilename && oldFilename !== newFilename) {
         return oldFilename + " -> " + newFilename;
     } else if (newFilename) {
@@ -388,62 +381,42 @@
     } else {
         return "Unknown filename";
     }
-        };
+};
 
-        var removeIns = function (line) {
+var removeIns = function (line) {
     return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
-        };
+};
 
-        var removeDel = function (line) {
+var removeDel = function (line) {
     return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
-        };
+};
 
-        /*
+/*
  * Utils
  */
 
-        function escape(str) {
+function escape(str) {
     return str.slice(0)
       .replace(/&/g, "&amp;")
       .replace(/</g, "&lt;")
       .replace(/>/g, "&gt;")
       .replace(/\t/g, "    ");
-        }
+}
 
-        function startsWith(str, start) {
+function startsWith(str, start) {
     return str.indexOf(start) === 0;
-        }
+}
 
-        function valueOrEmpty(value) {
+function valueOrEmpty(value) {
     return value ? value : "";
-        }
+}
 
-        function diffHighlight(diffLine1, diffLine2) {
+function diffHighlight(diffLine1, diffLine2) {
     /* remove the initial -/+ to avoid always having diff in the first char */
-            var highlightedLine = diffString(diffLine1.substr(1), diffLine2.substr(1));
+    var highlightedLine = JsDiff(diffLine1.substr(1), diffLine2.substr(1));
 
     return {
         o: diffLine1.charAt(0) + removeIns(highlightedLine),
         n: diffLine2.charAt(0) + removeDel(highlightedLine)
     }
-        }
+}
-
-        /* 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);

index.html

@@ -181,7 +181,8 @@
                 '-});\n';
 
         $(document).ready(function () {
-            var diffJson = Diff2Html.getJsonFromDiff(lineDiffExample);
+            var diff2Html = new Diff2Html();
+            var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
 
             var languages = diffJson.map(function (line) {
                 return line.language;
@@ -191,13 +192,13 @@
             });
             hljs.configure({languages: uniqueLanguages});
 
-            $("#line-by-line").html(Diff2Html.getPrettyHtmlFromJson(diffJson));
+            $("#line-by-line").html(diff2Html.getPrettyHtmlFromJson(diffJson));
             var code = $(".d2h-code-line");
             code.map(function (i, line) {
                 hljs.highlightBlock(line);
             });
 
-            $("#side-by-side").html(Diff2Html.getPrettySideBySideHtmlFromJson(diffJson));
+            $("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson));
             var codeSide = $(".d2h-code-side-line");
             codeSide.map(function (i, line) {
                 hljs.highlightBlock(line);

jsdiff.js

@@ -10,7 +10,7 @@
  *  http://ejohn.org/projects/javascript-diff-algorithm/
  */
 
-function diffString(o, n) {
+function JsDiff(o, n) {
     o = o.replace(/\s+$/, '');
     n = n.replace(/\s+$/, '');