revert scrollBehavior timing

yyx990803 · yyx990803 · commit d6e80cb0ed59 · 2016-09-28T12:50:21.000-04:00
diff --git a/src/history/html5.js b/src/history/html5.js
@@ -79,7 +79,7 @@ export class HTML5History extends History {
     assert(typeof behavior === 'function', `scrollBehavior must be a function`)
 
     // wait until re-render finishes before scrolling
-    setTimeout(() => {
+    router.app.$nextTick(() => {
       let position = getScrollPosition(_key)
       const shouldScroll = behavior(to, from, isPop ? position : null)
       if (!shouldScroll) {
@@ -100,7 +100,7 @@ export class HTML5History extends History {
       if (position) {
         window.scrollTo(position.x, position.y)
       }
-    }, 0)
+    })
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export class HTML5History extends History {`
`79`	`79`	assert(typeof behavior === 'function', `scrollBehavior must be a function`)
`80`	`80`
`81`	`81`	`// wait until re-render finishes before scrolling`
`82`		`- setTimeout(() => {`
	`82`	`+ router.app.$nextTick(() => {`
`83`	`83`	`let position = getScrollPosition(_key)`
`84`	`84`	`const shouldScroll = behavior(to, from, isPop ? position : null)`
`85`	`85`	`if (!shouldScroll) {`
`@@ -100,7 +100,7 @@ export class HTML5History extends History {`
`100`	`100`	`if (position) {`
`101`	`101`	`window.scrollTo(position.x, position.y)`
`102`	`102`	`}`
`103`		`- }, 0)`
	`103`	`+ })`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`