feat(core): call data method with this value (#6760)

#6739
vuejs · Oct 10, 2017 · 3a5432a · 3a5432a
1 parent 596257c
commit 3a5432a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/core/instance/state.js b/src/core/instance/state.js
@@ -161,7 +161,7 @@ function initData (vm: Component) {
 
 function getData (data: Function, vm: Component): any {
   try {
-    return data.call(vm)
+    return data.call(vm, vm)
   } catch (e) {
     handleError(e, vm, `data()`)
     return {}

diff --git a/test/unit/features/options/data.spec.js b/test/unit/features/options/data.spec.js
@@ -106,4 +106,21 @@ describe('Options data', () => {
     })
     expect(vm.a).toBe(1)
   })
+
+  it('should called with this', () => {
+    const vm = new Vue({
+      template: '<div><child></child></div>',
+      provide: { foo: 1 },
+      components: {
+        child: {
+          template: '<span>{{bar}}</span>',
+          inject: ['foo'],
+          data ({ foo }) {
+            return { bar: 'foo:' + foo }
+          }
+        }
+      }
+    }).$mount()
+    expect(vm.$el.innerHTML).toBe('<span>foo:1</span>')
+  })
 })