Refresh master with initial release/0.24 snapshot (#332)

* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json
This commit is contained in:
Karl Burtram
2017-12-15 15:38:57 -08:00
committed by GitHub
parent 271b3a0b82
commit 6ad0df0e3e
7118 changed files with 107999 additions and 56466 deletions

View File

@@ -20,7 +20,7 @@ export function mixin(destination: any, source: any, overwrite: boolean = true,
if (Types.isObject(destination[key]) && Types.isObject(source[key])) {
mixin(destination[key], source[key], overwrite, fn);
} else if(fn) {
fn(destination[key], source[key], overwrite);
destination[key] = fn(destination[key], source[key], overwrite);
} else {
destination[key] = source[key];
}