enhance merge method and fix ec option.backgroundColor merge bug.

ecomfe · Jan 14, 2016 · 08855cd · 08855cd
1 parent ad46a25
commit 08855cd
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/core/util.js b/src/core/util.js
@@ -53,16 +53,15 @@ define(function(require) {
  }
 
  /**
- * @param {Object=} target
- * @param {Object=} source
+ * @param {*} target
+ * @param {*} source
  * @param {boolean} [overwrite=false]
  */
  function merge(target, source, overwrite) {
- if (!target) { // Might be null/undefined
- return;
- }
- if (!source) { // Might be null/undefined
- return target;
+ // We should escapse that source is string
+ // and enter for ... in ...
+ if (!isObject(source) || !isObject(target)) {
+ return overwrite ? clone(source) : target;
  }
 
  for (var key in source) {