diff --git a/src/core/util/options.js b/src/core/util/options.js index 3be38b8e..ad36bb94 100644 --- a/src/core/util/options.js +++ b/src/core/util/options.js @@ -89,7 +89,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' @@ -123,7 +123,7 @@ strats.data = function ( return parentVal } - return mergeDataOrFn.call(this, parentVal, childVal) + return mergeDataOrFn(parentVal, childVal) } return mergeDataOrFn(parentVal, childVal, vm)