Merge branch 'tracker-compatibility' into tracker-compatibility-build

mitar · mitar · commit e6f9b2b19acf · 2017-07-08T02:20:39.000-07:00
diff --git a/src/core/observer/scheduler.js b/src/core/observer/scheduler.js
@@ -216,7 +216,7 @@ export function forceFlush (maxUpdateCount?: number) {
  * Are we inside a flush?
  */
 export function isFlushing () {
-  return flushing;
+  return flushing
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ export function forceFlush (maxUpdateCount?: number) {`
`216`	`216`	`* Are we inside a flush?`
`217`	`217`	`*/`
`218`	`218`	`export function isFlushing () {`
`219`		`- return flushing;`
	`219`	`+ return flushing`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`