handle data functions that return nothing

yyx990803 · yyx990803 · commit b80ae34b9c58 · 2016-03-20T16:39:49.000-04:00
diff --git a/src/instance/internal/state.js b/src/instance/internal/state.js
@@ -76,7 +76,7 @@ export default function (Vue) {
 
   Vue.prototype._initData = function () {
     var dataFn = this.$options.data
-    var data = this._data = dataFn ? dataFn() : {}
+    var data = this._data = dataFn ? dataFn() || {} : {}
     var props = this._props
     var runtimeData = this._runtimeData
       ? typeof this._runtimeData === 'function'
