Exclude not enumerable keys of inject object

vuejs · Aug 11, 2017 · 9bc91c5 · 9bc91c5
1 parent c628103
commit 9bc91c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/instance/inject.js b/src/core/instance/inject.js
@@ -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(function (key) {
+ return Reflect.getOwnPropertyDescriptor(inject, key).enumerable
+ })
  : Object.keys(inject)
 
  for (let i = 0; i < keys.length; i++) {

diff --git a/src/core/util/env.js b/src/core/util/env.js
@@ -61,7 +61,7 @@ export function isNative (Ctor: any): boolean {
 
 export const hasSymbol =
  typeof Symbol !== 'undefined' && isNative(Symbol) &&
- typeof Reflect !== 'undefined' && isNative(Reflect.ownKeys)
+ typeof Reflect !== 'undefined' && isNative(Reflect.ownKeys) && isNative(Reflect.getOwnPropertyDescriptor)
 
 /**
  * Defer a task to execute it asynchronously.