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

fix(core): fix defineReactive unnecessary getters call fix #7280 #7302

Merged
merged 2 commits into from
Mar 7, 2018
Merged

fix(core): fix defineReactive unnecessary getters call fix #7280 #7302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c39d016
fix(core): fix defineReactive unnecessary getters call
DeyLak Dec 21, 2017
a8dbd4c
refactor(core): strict arguments count compare
DeyLak Dec 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/core/observer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class Observer {
walk (obj: Object) {
const keys = Object.keys(obj)
for (let i = 0; i < keys.length; i++) {
defineReactive(obj, keys[i], obj[keys[i]])
defineReactive(obj, keys[i])
}
}

Expand Down Expand Up @@ -145,6 +145,9 @@ export function defineReactive (

// cater for pre-defined getter/setters
const getter = property && property.get
if (!getter && arguments.length === 2) {
val = obj[key]
}
const setter = property && property.set

let childOb = !shallow && observe(val)
Expand Down