Browse Source

Fix for object shadowing?

pull/1785/head
jlukic 10 years ago
parent
commit
eb223c6fad
2 changed files with 6 additions and 4 deletions
  1. 8
      tasks/config/project/config.js
  2. 2
      tasks/config/user.js

8
tasks/config/project/config.js

@ -3,9 +3,11 @@
*******************************/
var
defaults = require('../defaults'),
extend = require('node.extend'),
fs = require('fs'),
path = require('path')
path = require('path'),
defaults = require('../defaults')
;
@ -51,7 +53,7 @@ module.exports = {
// adds additional derived values to a config object
addDerivedValues: function(config) {
config = config || defaults;
config = config || extend(false, {}, defaults);
/*--------------
File Paths

2
tasks/config/user.js

@ -35,7 +35,7 @@ catch(error) {
if(!userConfig) {
// No semantic.json file use tasks/config/defaults.js
console.error('Using default values for gulp');
//userConfig = defaults;
userConfig = extend(false, {}, defaults);
}
else {
// extend defaults using shallow copy

Loading…
Cancel
Save