root
/
vue2
mirror of https://github.com/vuejs/vue.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

support sync watcher as internal flag

This commit is contained in:
Evan You 2016-06-21 03:03:49 -04:00
parent 0c9c6ed08d
commit 634a0734c4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/karma.cover.config.js
View File

@ -19,7 +19,8 @@ module.exports = function (config) {
ignore: [ ignore: [
'test/', 'test/',
'src/compiler/parser/html-parser.js', 'src/compiler/parser/html-parser.js',
'src/core/instance/proxy.js' 'src/core/instance/proxy.js',
'src/sfc/deindent.js'
] ]
}]] }]]
} }

5
src/core/observer/watcher.js
View File

@ -27,6 +27,7 @@ export default class Watcher {
deep: boolean; deep: boolean;
user: boolean; user: boolean;
lazy: boolean; lazy: boolean;
sync: boolean;
dirty: boolean; dirty: boolean;
active: boolean; active: boolean;
deps: Array<Dep>; deps: Array<Dep>;
@ -48,6 +49,7 @@ export default class Watcher {
this.deep = !!options.deep this.deep = !!options.deep
this.user = !!options.user this.user = !!options.user
this.lazy = !!options.lazy this.lazy = !!options.lazy
this.sync = !!options.sync
this.expression = expOrFn.toString() this.expression = expOrFn.toString()
this.cb = cb this.cb = cb
this.id = ++uid // uid for batching this.id = ++uid // uid for batching
@ -167,8 +169,11 @@ export default class Watcher {
* Will be called when a dependency changes. * Will be called when a dependency changes.
*/ */
update () { update () {
/* istanbul ignore else */
if (this.lazy) { if (this.lazy) {
this.dirty = true this.dirty = true
} else if (this.sync) {
this.run()
} else { } else {
queueWatcher(this) queueWatcher(this)
} }