From 6c8f4a983b0ae924cbc2a63395fa9d2bd2716464 Mon Sep 17 00:00:00 2001 From: HcySunYang Date: Thu, 22 Mar 2018 12:16:15 +0800 Subject: [PATCH 1/2] refactor: remove unnecessary checks --- src/core/instance/state.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/instance/state.js b/src/core/instance/state.js index b1549b0dcc4..b44be934b49 100644 --- a/src/core/instance/state.js +++ b/src/core/instance/state.js @@ -111,9 +111,7 @@ function initProps (vm: Component, propsOptions: Object) { function initData (vm: Component) { let data = vm.$options.data - data = vm._data = typeof data === 'function' - ? getData(data, vm) - : data || {} + data = vm._data = getData(data, vm) if (!isPlainObject(data)) { data = {} process.env.NODE_ENV !== 'production' && warn( From 8bbeb40ae69f7e4666a18c775ae98c89be2d258e Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 22 Mar 2018 09:55:54 -0400 Subject: [PATCH 2/2] Update state.js --- src/core/instance/state.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/instance/state.js b/src/core/instance/state.js index b44be934b49..eb8ec4b71b8 100644 --- a/src/core/instance/state.js +++ b/src/core/instance/state.js @@ -111,6 +111,7 @@ 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) if (!isPlainObject(data)) { data = {}