Release version 2.0.7

rtfpessoa · Oct 8, 2016 · 1e22a3e · 1e22a3e
1 parent 7d02e67
commit 1e22a3e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "homepage": "https://diff2html.xyz",
   "description": "Fast Diff to colorized HTML",
   "keywords": [

diff --git a/dist/diff2html-ui.js b/dist/diff2html-ui.js
@@ -33,10 +33,11 @@
 
   Diff2HtmlUI.prototype.draw = function(targetId, config) {
     var cfg = config || {};
+    cfg.inputFormat = 'json';
     var $target = this._getTarget(targetId);
     $target.html(Diff2Html.getPrettyHtml(diffJson, cfg));
 
-    synchronisedScroll($target, config);
+    synchronisedScroll($target, cfg);
   };
 
   function synchronisedScroll($target, config) {

diff --git a/dist/diff2html-ui.min.js b/dist/diff2html-ui.min.js
diff --git a/dist/diff2html.js b/dist/diff2html.js
@@ -2572,6 +2572,8 @@ process.umask = function() { return 0; };
     var dissimilarityIndex = /^dissimilarity index (\d+)%/;
     var index = /^index ([0-9a-z]+)\.\.([0-9a-z]+)\s*(\d{6})?/;
 
+    var binaryFiles = /^Binary files (.*) and (.*) differ/;
+
     /* Combined Diff */
     var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)\.\.([0-9a-z]+)/;
     var combinedMode = /^mode (\d{6}),(\d{6})\.\.(\d{6})/;
@@ -2701,6 +2703,10 @@ process.umask = function() { return 0; };
           currentFile.newName = values[1];
         }
         currentFile.isRename = true;
+      } else if ((values = binaryFiles.exec(line))) {
+        currentFile.isBinary = true;
+        currentFile.oldName = _getFilename(null, values[1], [config.srcPrefix]);
+        currentFile.newName = _getFilename(null, values[2], [config.dstPrefix]);
       } else if ((values = similarityIndex.exec(line))) {
         currentFile.unchangedPercentage = values[1];
       } else if ((values = dissimilarityIndex.exec(line))) {
@@ -2760,7 +2766,12 @@ process.umask = function() { return 0; };
   }
 
   function _getFilename(linePrefix, line, prefixes) {
-    var FilenameRegExp = new RegExp('^' + linePrefix + ' "?(.+?)"?$');
+    var FilenameRegExp;
+    if (linePrefix) {
+      FilenameRegExp = new RegExp('^' + linePrefix + ' "?(.+?)"?$');
+    } else {
+      FilenameRegExp = new RegExp('^"?(.+?)"?$');
+    }
 
     var filename;
     var values = FilenameRegExp.exec(line);

diff --git a/dist/diff2html.min.js b/dist/diff2html.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "homepage": "https://diff2html.xyz",
   "description": "Fast Diff to colorized HTML",
   "keywords": [