test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-04 21:17:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/instance/state.js
View File

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

10
test/unit/features/options/methods.spec.js
View File

@ -24,14 +24,4 @@ describe('Options methods', () => {
}) })
expect(`method "hello" has an undefined value in the component definition`).toHaveBeenWarned() 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()
})
}) })