diff --git a/object.js b/object.js index 47351c0..ba50d54 100755 --- a/object.js +++ b/object.js @@ -1273,7 +1273,7 @@ Constructor('Mixin', { // This can be: // 'proto' - mix data into prototype chain (default) // 'flat' - use mixinFlat(..) to copy data - // 'softflat' - like 'flat' but uses mixinFlat('soft', ..) + // 'soft' - like 'flat' but uses mixinFlat('soft', ..) mode: 'proto', // base API... @@ -1289,7 +1289,7 @@ Constructor('Mixin', { && ([_, mode, target] = arguments) return mode == 'flat' ? this.constructor.mixinFlat(target, this.data) - : mode == 'softflat' ? + : mode == 'soft' ? this.constructor.mixinFlat('soft', target, this.data) : this.constructor.mixin(target, this.data) }, diff --git a/package.json b/package.json index 9d08e02..22a3d83 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ig-object", - "version": "5.4.10", + "version": "5.4.11", "description": "", "main": "object.js", "scripts": { diff --git a/test.js b/test.js index 0bba893..b55d597 100755 --- a/test.js +++ b/test.js @@ -760,7 +760,7 @@ var cases = test.Cases({ assert('b' in x == false, 'post-mixout content gone') assert('c' in x == false, 'post-mixout content gone') - var z = assert(C('softflat', {a:'zzz'}), `C("flat", {})`) + var z = assert(C('soft', {a:'zzz'}), `C("flat", {})`) assert(z.a == 'zzz', 'no overwrite') assert(z.b == 'bbb', 'mixin content from C')