Skip to content

fix #1834 #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2017
Merged

fix #1834 #1835

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b14774
fix #1834
JounQin Oct 19, 2017
142d8ef
judge supportsPushState before setupScroll
JounQin Oct 19, 2017
ef3a224
expectScroll -> supportsScroll
JounQin Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/history/html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ import { History } from './base'
import { cleanPath } from '../util/path'
import { START } from '../util/route'
import { setupScroll, handleScroll } from '../util/scroll'
import { pushState, replaceState } from '../util/push-state'
import { pushState, replaceState, supportsPushState } from '../util/push-state'

export class HTML5History extends History {
constructor (router: Router, base: ?string) {
super(router, base)

const expectScroll = router.options.scrollBehavior
const supportsScroll = supportsPushState && expectScroll

if (expectScroll) {
if (supportsScroll) {
setupScroll()
}

Expand Down