Prepare for beta 10 release

rtfpessoa · rtfpessoa · commit 7aeb70b9bc83 · 2016-04-14T19:51:44.000+01:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.0-beta9",
+  "version": "2.0.0-beta10",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [
diff --git a/dist/diff2html.js b/dist/diff2html.js
@@ -2199,7 +2199,10 @@
 	        var insertType;
 	        var deleteType;
 
-	        var doMatching = that.config.matching === 'lines' || that.config.matching === 'words';
+	        var comparisons = oldLines.length * newLines.length;
+	        var maxComparisons = that.config.matchingMaxComparisons || 2500;
+	        var doMatching = comparisons < maxComparisons && (that.config.matching === 'lines' ||
+	            that.config.matching === 'words');
 
 	        if (doMatching) {
 	          matches = matcher(oldLines, newLines);
@@ -5411,7 +5414,11 @@
 	        var matches;
 	        var insertType;
 	        var deleteType;
-	        var doMatching = that.config.matching === 'lines' || that.config.matching === 'words';
+
+	        var comparisons = oldLines.length * newLines.length;
+	        var maxComparisons = that.config.matchingMaxComparisons || 2500;
+	        var doMatching = comparisons < maxComparisons && (that.config.matching === 'lines' ||
+	            that.config.matching === 'words');
 
 	        if (doMatching) {
 	          matches = matcher(oldLines, newLines);
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.0-beta9",
+  "version": "2.0.0-beta10",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "diff2html",`
`3`		`- "version": "2.0.0-beta9",`
	`3`	`+ "version": "2.0.0-beta10",`
`4`	`4`	`"homepage": "http://rtfpessoa.github.io/diff2html/",`
`5`	`5`	`"description": "Fast Diff to colorized HTML",`
`6`	`6`	`"keywords": [`