Skip to content
Browse files

Don't merge component overrides into project metadata.

  • Loading branch information...
1 parent e370e0c commit 1fd868dd0bf959d16f8e2c5f7f1afd61b4fed218 @rgrove committed Sep 27, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/selleck.js
  2. +1 −1 lib/util.js
View
2 lib/selleck.js
@@ -359,7 +359,7 @@ function prepare(inDir, options, callback) {
// else.
util.mix(options.meta, options.overrideMeta);
- if (options.overrideMeta && options.overrideMeta.componentDefaults) {
+ if (options.component && options.overrideMeta && options.overrideMeta.componentDefaults) {
util.mix(options.meta, options.overrideMeta.componentDefaults);
}
View
2 lib/util.js
@@ -93,7 +93,7 @@ function mix() {
key = keys[i];
value = source[key];
- if (typeof value === 'object' && !Array.isArray(value)) {
+ if (value && typeof value === 'object' && !Array.isArray(value)) {
typeof target[key] === 'object' || (target[key] = {});
mix(target[key], value);
} else {

0 comments on commit 1fd868d

Please sign in to comment.
Something went wrong with that request. Please try again.