optimize scroll position saving (fix #1145)

yyx990803 · yyx990803 · commit b6f96e981767 · 2017-02-13T21:19:54.000-05:00
diff --git a/src/util/push-state.js b/src/util/push-state.js
@@ -38,6 +38,7 @@ export function setStateKey (key: string) {
 }
 
 export function pushState (url?: string, replace?: boolean) {
+  saveScrollPosition()
   // try...catch the pushState call to get around Safari
   // DOM Exception 18 where it limits to 100 pushState calls
   const history = window.history
@@ -48,7 +49,6 @@ export function pushState (url?: string, replace?: boolean) {
       _key = genKey()
       history.pushState({ key: _key }, '', url)
     }
-    saveScrollPosition()
   } catch (e) {
     window.location[replace ? 'replace' : 'assign'](url)
   }
diff --git a/src/util/scroll.js b/src/util/scroll.js
@@ -8,12 +8,11 @@ const positionStore = Object.create(null)
 
 export function setupScroll () {
   window.addEventListener('popstate', e => {
+    saveScrollPosition()
     if (e.state && e.state.key) {
       setStateKey(e.state.key)
     }
   })
-
-  window.addEventListener('scroll', saveScrollPosition)
 }
 
 export function handleScroll (

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ export function setStateKey (key: string) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`export function pushState (url?: string, replace?: boolean) {`
	`41`	`+ saveScrollPosition()`
`41`	`42`	`// try...catch the pushState call to get around Safari`
`42`	`43`	`// DOM Exception 18 where it limits to 100 pushState calls`
`43`	`44`	`const history = window.history`
`@@ -48,7 +49,6 @@ export function pushState (url?: string, replace?: boolean) {`
`48`	`49`	`_key = genKey()`
`49`	`50`	`history.pushState({ key: _key }, '', url)`
`50`	`51`	`}`
`51`		`- saveScrollPosition()`
`52`	`52`	`} catch (e) {`
`53`	`53`	`window.location[replace ? 'replace' : 'assign'](url)`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,11 @@ const positionStore = Object.create(null)`
`8`	`8`
`9`	`9`	`export function setupScroll () {`
`10`	`10`	`window.addEventListener('popstate', e => {`
	`11`	`+ saveScrollPosition()`
`11`	`12`	`if (e.state && e.state.key) {`
`12`	`13`	`setStateKey(e.state.key)`
`13`	`14`	`}`
`14`	`15`	`})`
`15`		`-`
`16`		`- window.addEventListener('scroll', saveScrollPosition)`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`export function handleScroll (`