Merge pull request #52 from felicienfrancois/master

Fix for #51 Wrong result of JsDiff.diffLines

Author: kpdecker

Diff for: diff.js

@@ -270,13 +270,8 @@
             lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';
 
         // Merge lines that may contain windows new lines
-        if (line === '\n' && (lastLineLastChar === '\r' || lastLineLastChar === '\n')) {
-          if (this.ignoreTrim || lastLineLastChar === '\n'){
-            //to avoid merging to \n\n, remove \n and add \r\n.
+        if (line === '\n' && lastLineLastChar === '\r') {
             retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0,-1) + '\r\n';
-          } else {
-            retLines[retLines.length - 1] += '\n';
-          }
         } else if (line) {
           if (this.ignoreTrim) {
             line = line.trim();

Diff for: test/diffTest.js

@@ -198,6 +198,13 @@ describe('#diffLines', function() {
       'line\r\nnew value\r\nline');
     diff.convertChangesToXML(diffResult).should.equal('line\r\n<ins>new value\r\n</ins><del>old value \r\n</del>line');
   });
+  
+  it('should handle empty lines', function() {
+    var diffResult = diff.diffLines(
+      'line\n\nold value \n\nline',
+      'line\n\nnew value\n\nline');
+    diff.convertChangesToXML(diffResult).should.equal('line\n\n<ins>new value\n</ins><del>old value \n</del>\nline');
+  });
 });
 
 // Trimmed Line Diff