luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use lodash merge cherry picked

Browse source
This commit is contained in:
YOU54F 2019-05-09 13:45:23 +01:00
parent 4c15a9ca93
commit c427a91dee
5 changed files with 2629 additions and 4142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2816
dist/diff2html.js vendored
View file

File diff suppressed because it is too large Load diff

2
dist/diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -56,7 +56,7 @@
"dependencies": { "dependencies": {
"diff": "^4.0.1", "diff": "^4.0.1",
"hogan.js": "^3.0.2", "hogan.js": "^3.0.2",
"merge": "^1.2.1", "lodash": "^4.7.11",
"whatwg-fetch": "^3.0.0" "whatwg-fetch": "^3.0.0"
}, },
"devDependencies": { "devDependencies": {

6
src/utils.js
View file

@ -6,7 +6,7 @@
*/ */
(function() { (function() {
var merge = require('merge'); var merge = require('lodash/merge');
function Utils() { function Utils() {
} }
@ -41,7 +41,9 @@
}; };
Utils.prototype.safeConfig = function(cfg, defaultConfig) { Utils.prototype.safeConfig = function(cfg, defaultConfig) {
return merge.recursive(true, defaultConfig, cfg); var newCfg = {};
merge(newCfg, defaultConfig, cfg);
return newCfg;
}; };
module.exports.Utils = new Utils(); module.exports.Utils = new Utils();

3945
yarn.lock
View file

File diff suppressed because it is too large Load diff