luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare for beta 10 release

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-04-14 19:51:44 +01:00
parent 0950d2b53f
commit 7aeb70b9bc
No known key found for this signature in database
GPG key ID: 08E3C5F38969078E
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "2.0.0-beta9", "version": "2.0.0-beta10",
"homepage": "http://rtfpessoa.github.io/diff2html/", "homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [

11
dist/diff2html.js vendored
View file

@ -2199,7 +2199,10 @@
var insertType; var insertType;
var deleteType; 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) { if (doMatching) {
matches = matcher(oldLines, newLines); matches = matcher(oldLines, newLines);
@ -5411,7 +5414,11 @@
var matches; var matches;
var insertType; var insertType;
var deleteType; 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) { if (doMatching) {
matches = matcher(oldLines, newLines); matches = matcher(oldLines, newLines);

4
dist/diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "2.0.0-beta9", "version": "2.0.0-beta10",
"homepage": "http://rtfpessoa.github.io/diff2html/", "homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [