flynx/diff.js
1
0
Fork 0
mirror of https://github.com/flynx/diff.js.git synced 2025-10-29 02:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks + notes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-10-15 22:55:36 +03:00
parent 3be394b85d
commit 129aee2485
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diff.js
View File

@ -396,14 +396,14 @@ module.ANY =
// -> pattern // -> pattern
// //
// This matches null and undefined. // This matches null and undefined.
//
// NOTE: this will not match NaN (XXX revise)
var NULL = var NULL =
module.NULL = module.NULL =
makeCIPattern('NULL', makeCIPattern('NULL',
function(obj){ function(obj){
return obj === null return obj === null
|| obj === undefined })() || obj === undefined
// XXX is this the right way to go?
|| isNaN(obj) })()
// Bool pattern... // Bool pattern...
@ -1356,6 +1356,11 @@ module.Types = {
// XXX there are two approaches to this: // XXX there are two approaches to this:
// 1) naive: simply concatenate all the changes in order... // 1) naive: simply concatenate all the changes in order...
// 2) filter and merge changes based on path... // 2) filter and merge changes based on path...
// XXX ...another way to go might be to apply the diffs in sequence
// to an empty object and then reconstruct a single diff from
// the result...
// ...this would require us to do this on both A and B sides,
// i.e. build-then-change...
// XXX do we need a conflict resolution policy??? // XXX do we need a conflict resolution policy???
merge: function(diff, other){ merge: function(diff, other){
// XXX // XXX