Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude not enumerable keys of inject object #6346

Merged
merged 7 commits into from
Sep 13, 2017
Merged

Exclude not enumerable keys of inject object #6346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c628103
[release] weex-vue-framework@2.4.2-weex.1 (#6196)
Hanks10100 Jul 24, 2017
9bc91c5
Exclude not enumerable keys of inject object
Aug 11, 2017
3b66b24
Should not warn when injection key which is not provided is not enume…
Aug 13, 2017
968f384
Merge branch 'dev' into dev
yyx990803 Sep 13, 2017
6b056c6
Update inject.js
yyx990803 Sep 13, 2017
9df0264
Update env.js
yyx990803 Sep 13, 2017
f3f2b16
Update inject.js
yyx990803 Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/instance/inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ export function resolveInject (inject: any, vm: Component): ?Object {
// inject is :any because flow is not smart enough to figure out cached
const result = Object.create(null)
const keys = hasSymbol
? Reflect.ownKeys(inject)
? Reflect.ownKeys(inject).filter(key => {
return Object.getOwnPropertyDescriptor(inject, key).enumerable
})
: Object.keys(inject)

for (let i = 0; i < keys.length; i++) {
Expand Down
10 changes: 9 additions & 1 deletion test/unit/features/options/inject.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,15 @@ describe('Options provide/inject', () => {
expect(`Injection "baz" not found`).not.toHaveBeenWarned()
})

// GitHub issue #6008
it('should not warn when injection key which is not provided is not enumerable', () => {
const parent = new Vue({ provide: { foo: 1 }})
const inject = { foo: 'foo' }
Object.defineProperty(inject, '__ob__', { enumerable: false, value: '__ob__' })
new Vue({ parent, inject })
expect(`Injection "__ob__" not found`).not.toHaveBeenWarned()
})

// Github issue #6008
it('should merge provide from mixins (objects)', () => {
const mixinA = { provide: { foo: 'foo' }}
const mixinB = { provide: { bar: 'bar' }}
Expand Down