不要怂,就是干,撸起袖子干!

Commit 02fc6b71 by Jonatan Männchen

Change _.extend + _.each to _.merge

1 parent 691beb44
Showing with 1 additions and 7 deletions
...@@ -533,13 +533,7 @@ module.exports = (function() { ...@@ -533,13 +533,7 @@ module.exports = (function() {
, globalOptions = this.options; , globalOptions = this.options;
if (globalOptions.define) { if (globalOptions.define) {
options = Utils._.extend({}, globalOptions.define, options); options = Utils._.merge({}, globalOptions.define, options);
Utils._(['classMethods', 'instanceMethods', 'getterMethods', 'setterMethods']).each(function(key) {
if (globalOptions.define[key]) {
options[key] = options[key] || {};
Utils._.defaults(options[key], globalOptions.define[key]);
}
});
} }
options = Utils._.merge({ options = Utils._.merge({
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!