Don't merge component overrides into project metadata.

rgrove · Sep 27, 2011 · 1fd868d · 1fd868d
1 parent e370e0c
commit 1fd868d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/selleck.js b/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);
     }
 

diff --git a/lib/util.js b/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 {