improve mergeData for edge cases (fix vuejs#4191)

yyx990803 · yyx990803 · commit 79cc7bc97a6a · 2016-11-15T15:15:04.000-05:00
diff --git a/src/core/util/options.js b/src/core/util/options.js
@@ -40,13 +40,16 @@ if (process.env.NODE_ENV !== 'production') {
  * Helper that recursively merges two data objects together.
  */
 function mergeData (to: Object, from: ?Object): Object {
+  if (!from) return to
   let key, toVal, fromVal
-  for (key in from) {
+  const keys = Object.keys(from)
+  for (let i = 0; i < keys.length; i++) {
+    key = keys[i]
     toVal = to[key]
     fromVal = from[key]
     if (!hasOwn(to, key)) {
       set(to, key, fromVal)
-    } else if (isObject(toVal) && isObject(fromVal)) {
+    } else if (isPlainObject(toVal) && isPlainObject(fromVal)) {
       mergeData(toVal, fromVal)
     }
   }
