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.

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

Small performance improvement in watcher.js #4069

Merged
merged 3 commits into from
Nov 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/compiler/codegen/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ function genText (text: ASTText | ASTExpression): string {
function genSlot (el: ASTElement): string {
const slotName = el.slotName || '"default"'
const children = genChildren(el)
return children
? `_t(${slotName},${children})`
: `_t(${slotName})`
return `_t(${slotName}${
children ? `,${children}` : ''
})`
}

function genComponent (el: any): string {
Expand Down
44 changes: 22 additions & 22 deletions src/core/observer/watcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,30 +230,30 @@ export default class Watcher {
* is collected as a "deep" dependency.
*/
const seenObjects = new Set()
function traverse (val: any, seen?: Set) {
function traverse (val: any) {
seenObjects.clear()
_traverse(val, seenObjects)
}

function _traverse (val: any, seen: Set) {
let i, keys
if (!seen) {
seen = seenObjects
seen.clear()
}
const isA = Array.isArray(val)
const isO = isObject(val)
if ((isA || isO) && Object.isExtensible(val)) {
if (val.__ob__) {
const depId = val.__ob__.dep.id
if (seen.has(depId)) {
return
} else {
seen.add(depId)
}
}
if (isA) {
i = val.length
while (i--) traverse(val[i], seen)
} else if (isO) {
keys = Object.keys(val)
i = keys.length
while (i--) traverse(val[keys[i]], seen)
if ((!isA && !isObject(val)) || !Object.isExtensible(val)) {
return
}
if (val.__ob__) {
const depId = val.__ob__.dep.id
if (seen.has(depId)) {
return
}
seen.add(depId)
}
if (isA) {
i = val.length
while (i--) _traverse(val[i], seen)
} else {
keys = Object.keys(val)
i = keys.length
while (i--) _traverse(val[keys[i]], seen)
}
}