Revert "fix #4041, warn overriding Vue's internal methods (#4111)"

This reverts commit 4078ce9c58.
This commit is contained in:
Evan You 2016-11-09 16:06:29 -05:00
parent eb601adb6d
commit 1bcc571739
2 changed files with 2 additions and 18 deletions

View File

@ -21,8 +21,6 @@ import {
noop
} from '../util/index'
import BuiltinVue from '../index'
export function initState (vm: Component) {
vm._watchers = []
initProps(vm)
@ -145,16 +143,12 @@ function initMethods (vm: Component) {
if (methods) {
for (const key in methods) {
vm[key] = methods[key] == null ? noop : bind(methods[key], vm)
if (process.env.NODE_ENV !== 'production') {
methods[key] == null && warn(
if (process.env.NODE_ENV !== 'production' && methods[key] == null) {
warn(
`method "${key}" has an undefined value in the component definition. ` +
`Did you reference the function correctly?`,
vm
)
hasOwn(BuiltinVue.prototype, key) && warn(
`Avoid overriding Vue's internal method "${key}".`,
vm
)
}
}
}

View File

@ -24,14 +24,4 @@ describe('Options methods', () => {
})
expect(`method "hello" has an undefined value in the component definition`).toHaveBeenWarned()
})
it('should warn overriding builtin methods', () => {
new Vue({
methods: {
$emit () {
}
}
})
expect(`Avoid overriding Vue's internal method "$emit".`).toHaveBeenWarned()
})
})