Browse Source

Revert "refactor: remove unnecessary checks (#7875)"

This reverts commit 43551b4fb60f449eb28600023eb0d3a3cf604a0e.
Evan You 8 years ago
parent
commit
903be9b91f
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/core/instance/state.js

+ 3 - 2
src/core/instance/state.js

@@ -111,8 +111,9 @@ function initProps (vm: Component, propsOptions: Object) {
 
 function initData (vm: Component) {
   let data = vm.$options.data
-  // $options.data is guaranteed to be a function after merge
-  data = vm._data = getData(data, vm)
+  data = vm._data = typeof data === 'function'
+    ? getData(data, vm)
+    : data || {}
   if (!isPlainObject(data)) {
     data = {}
     process.env.NODE_ENV !== 'production' && warn(