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

fixed a bug + found a new one...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-07-31 14:12:10 +03:00
parent 82f68b254f
commit 421a26352f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
diff.js
View File

@ -17,6 +17,9 @@ var FORMAT_NAME = 'object-diff'
var FORMAT_VERSION = '0.0.0' var FORMAT_VERSION = '0.0.0'
var MIN_TEXT_LENGTH = 100
/*********************************************************************/ /*********************************************************************/
// //
@ -908,8 +911,7 @@ module.Types = {
var res = this.handle(type, {}, diff, A, B, options) var res = this.handle(type, {}, diff, A, B, options)
// handle things we treat as objects (skipping object itself)... // handle things we treat as objects (skipping object itself)...
if(!options.no_attributes if(!options.no_attributes
&& type !== Object && !this.get(type).no_attributes){
&& type != 'Basic'){
// XXX need to strip array items from this... // XXX need to strip array items from this...
this.handle(Object, res, diff, A, B, options) this.handle(Object, res, diff, A, B, options)
} }
@ -1116,6 +1118,7 @@ module.Types = {
// container... // container...
Types.set('Basic', { Types.set('Basic', {
priority: 50, priority: 50,
no_attributes: true,
check: function(obj, options){ check: function(obj, options){
return typeof(obj) != 'object' }, return typeof(obj) != 'object' },
@ -1153,6 +1156,9 @@ Types.set('Basic', {
// XXX add attr order support... // XXX add attr order support...
Types.set(Object, { Types.set(Object, {
priority: -100, priority: -100,
// NOTE: the object will itself handle the attributes, no need for a
// second pass...
no_attributes: true,
handle: function(obj, diff, A, B, options){ handle: function(obj, diff, A, B, options){
// attrebutes/items... // attrebutes/items...
@ -1448,15 +1454,16 @@ Types.set(Map, {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Text... // Text...
// XXX TEST: .patch(..) // XXX TEST: .patch(..) -- does not work yet...
Types.set('Text', { Types.set('Text', {
// this must be checked before the 'Base'... // this must be checked before the 'Base'...
priority: 100, priority: 100,
no_attributes: true,
check: function(obj, options){ check: function(obj, options){
options = options || {} options = options || {}
min = options.min_text_length || 1000 min = options.min_text_length || MIN_TEXT_LENGTH
return typeof(obj) == 'string' return typeof(obj) == typeof('str')
&& min > 0 && min > 0
&& (obj.length > min && (obj.length > min
&& /\n/.test(obj)) && /\n/.test(obj))
@ -1545,7 +1552,7 @@ Types.set(LogicType, {
// // // //
// // NOTE: a string must also contain at least one \n to be text // // NOTE: a string must also contain at least one \n to be text
// // diffed... // // diffed...
// min_text_length: 1000 | -1, // min_text_length: 100 | -1,
// //
// // If true, disable attribute diff for non Object's... // // If true, disable attribute diff for non Object's...
// // // //
@ -1665,8 +1672,8 @@ var DiffPrototype = {
// XXX is this the right thing to do??? // XXX is this the right thing to do???
// ...the bad thing here is that this can be mutated from the // ...the bad thing here is that this can be mutated from the
// instance when returned like this... // instance when returned like this...
get types(){ //get types(){
return this.constructor.type }, // return this.constructor.type },
structure: null, structure: null,
placeholders: null, placeholders: null,