archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

router: fix route value on popstate (#490)

Browse source
This commit is contained in:
Naoyuki Kanezawa 2016-12-24 02:14:14 +09:00 committed by Guillermo Rauch
parent b9bee24787
commit 74d4d22f84
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/router/router.js
View file

@ -25,8 +25,9 @@ export default class Router {
onPopState (e) {
this.abortComponentLoad()
const { pathname, query } = parse(window.location.href, true)
const route = (e.state || {}).route || toRoute(pathname)
let { route } = e.state || {}
const { pathname, query } = parse(route || window.location.href, true)
if (!route) route = toRoute(pathname)
Promise.resolve()
.then(async () => {