-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8f7abbe
commit f4205e5
Showing
11 changed files
with
137 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,40 @@ | ||
/*! | ||
diff v5.1.0 | ||
Software License Agreement (BSD License) | ||
Copyright (c) 2009-2015, Kevin Decker <[email protected]> | ||
All rights reserved. | ||
Redistribution and use of this software in source and binary forms, with or without modification, | ||
are permitted provided that the following conditions are met: | ||
* Redistributions of source code must retain the above | ||
copyright notice, this list of conditions and the | ||
following disclaimer. | ||
* Redistributions in binary form must reproduce the above | ||
copyright notice, this list of conditions and the | ||
following disclaimer in the documentation and/or other | ||
materials provided with the distribution. | ||
* Neither the name of Kevin Decker nor the names of its | ||
contributors may be used to endorse or promote products | ||
derived from this software without specific prior | ||
written permission. | ||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR | ||
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER | ||
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | ||
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
@license | ||
*/ | ||
(function (global, factory) { | ||
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : | ||
typeof define === 'function' && define.amd ? define(['exports'], factory) : | ||
|
@@ -38,6 +75,11 @@ | |
oldLen = oldString.length; | ||
var editLength = 1; | ||
var maxEditLength = newLen + oldLen; | ||
|
||
if (options.maxEditLength) { | ||
maxEditLength = Math.min(maxEditLength, options.maxEditLength); | ||
} | ||
|
||
var bestPath = [{ | ||
newPos: -1, | ||
components: [] | ||
|
@@ -102,15 +144,13 @@ | |
editLength++; | ||
} // Performs the length of edit iteration. Is a bit fugly as this has to support the | ||
// sync and async mode which is never fun. Loops over execEditLength until a value | ||
// is produced. | ||
// is produced, or until the edit length exceeds options.maxEditLength (if given), | ||
// in which case it will return undefined. | ||
|
||
|
||
if (callback) { | ||
(function exec() { | ||
setTimeout(function () { | ||
// This should not happen, but we want to be safe. | ||
|
||
/* istanbul ignore next */ | ||
if (editLength > maxEditLength) { | ||
return callback(); | ||
} | ||
|
@@ -928,6 +968,11 @@ | |
} | ||
|
||
var diff = diffLines(oldStr, newStr, options); | ||
|
||
if (!diff) { | ||
return; | ||
} | ||
|
||
diff.push({ | ||
value: '', | ||
lines: [] | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.