diff2html - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

package.json

 {
   "name":     "diff2html",
-  "version":  "0.2.1",
+  "version":  "0.2.2",
 
@@ -5,0 +5,0 @@ "homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs",

src/line-by-line-printer.js

@@ -87,4 +87,4 @@ /*
 
-              processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.o);
-              processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
+              processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.first.line, diff.first.prefix);
+              processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.second.line, diff.second.prefix);
             }
@@ -129,3 +129,9 @@
 
-  function generateLineHtml(type, oldNumber, newNumber, content) {
+  function generateLineHtml(type, oldNumber, newNumber, content, prefix) {
+    var htmlPrefix = "";
+    if (prefix) htmlPrefix = "<span class=\"d2h-code-line-prefix\">" + prefix + "</span>";
+
+    var htmlContent = "";
+    if (content) htmlContent = "<span class=\"d2h-code-line-ctn\">" + content + "</span>";
+
     return "<tr>\n" +
@@ -137,3 +143,3 @@ "  <td class=\"d2h-code-linenumber " + type + "\">" +
       "  <td class=\"" + type + "\">" +
-      "    <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
+      "    <div class=\"d2h-code-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
       "  </td>\n" +
@@ -140,0 +146,0 @@ "</tr>\n";

src/printer-utils.js

@@ -50,5 +50,2 @@ /*
 
-    //var diff = jsDiff.diffChars(diffLine1, diffLine2);
-    //var diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
-
     var highlightedLine = "";
@@ -64,4 +61,10 @@
     return {
-      o: lineStart1 + removeIns(highlightedLine),
-      n: lineStart2 + removeDel(highlightedLine)
+      first: {
+        prefix: lineStart1,
+        line: removeIns(highlightedLine)
+      },
+      second: {
+        prefix: lineStart2,
+        line: removeDel(highlightedLine)
+      }
     }
@@ -68,0 +71,0 @@ };

src/side-by-side-printer.js

@@ -66,14 +66,14 @@ /*
       fileHtml.left += "<tr>\n" +
-      "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
-      "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
-      "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
-      "  </td>\n" +
-      "</tr>\n";
+        "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
+        "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+        "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
+        "  </td>\n" +
+        "</tr>\n";
 
       fileHtml.right += "<tr>\n" +
-      "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
-      "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
-      "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
-      "  </td>\n" +
-      "</tr>\n";
+        "  <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
+        "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+        "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
+        "  </td>\n" +
+        "</tr>\n";
 
@@ -113,4 +113,4 @@ var oldLines = [], newLines = [];
 
-              fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.o);
-              fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
+              fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.first.line, diff.first.prefix);
+              fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.second.line, diff.second.prefix);
             }
@@ -164,7 +164,13 @@ } else {
 
-  function generateSingleLineHtml(type, number, content) {
+  function generateSingleLineHtml(type, number, content, prefix) {
+    var htmlPrefix = "";
+    if (prefix) htmlPrefix = "<span class=\"d2h-code-line-prefix\">" + prefix + "</span>";
+
+    var htmlContent = "";
+    if (content) htmlContent = "<span class=\"d2h-code-line-ctn\">" + content + "</span>";
+
     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>" +
+      "      <div class=\"d2h-code-side-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
       "    </td>\n" +
@@ -179,8 +185,8 @@ "  </tr>\n";
     fileHtml.left = "<tr>\n" +
-    "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
-    "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" +
-    "File without changes" +
-    "    </div>" +
-    "  </td>\n" +
-    "</tr>\n";
+      "  <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
+      "    <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" +
+      "File without changes" +
+      "    </div>" +
+      "  </td>\n" +
+      "</tr>\n";
 
@@ -187,0 +193,0 @@ return fileHtml;

No alert changes

Improved metrics

Total package byte prevSize

50046

increased by1.28%

Lines of code

1158

increased by1.05%

No dependency changes