refactor: tweak data merge strategy (vuejs#6833)

* tweak: The value of this is always undefined * parentVal and childVal must have a presence, otherwise the strats.data policy function will not be executed
erweixin · Dec 15, 2017 · c33955f · c33955f
1 parent 4fc479d
commit c33955f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/util/options.js b/src/core/util/options.js
@@ -100,7 +100,7 @@ export function mergeDataOrFn (
         typeof parentVal === 'function' ? parentVal.call(this) : parentVal
       )
     }
-  } else if (parentVal || childVal) {
+  } else {
     return function mergedInstanceDataFn () {
       // instance merge
       const instanceData = typeof childVal === 'function'
@@ -134,7 +134,7 @@ strats.data = function (
 
       return parentVal
     }
-    return mergeDataOrFn.call(this, parentVal, childVal)
+    return mergeDataOrFn(parentVal, childVal)
   }
 
   return mergeDataOrFn(parentVal, childVal, vm)