Skip to content
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

Jump to bottom

fix(history): stricter check of base in HTML5 #3556

Merged
merged 7 commits into from May 31, 2021
Merged

fix(history): stricter check of base in HTML5 #3556

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d976211
fix(html5): initial path in HTML5 vs base (#3555)
eyedean May 20, 2021
7e18892
fix(html5): fixed linting issues (#3555)
eyedean May 20, 2021
9fdc9e8
fix(html5): fixed spacing issues (#3555)
eyedean May 20, 2021
5f42a2a
fix(html5): bettre comments (#3555)
eyedean May 20, 2021
a4b2f7a
Revert "fix(html5): bettre comments (#3555)"
eyedean May 28, 2021
2407576
fix(html5): added explicit variable names
eyedean May 31, 2021
ef071b5
Update src/history/html5.js
posva May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/history/html5.js
View file
Open in desktop
Expand Up @@ -87,7 +87,13 @@ export class HTML5History extends History {

export function getLocation (base: string): string {
let path = window.location.pathname
if (base && path.toLowerCase().indexOf(base.toLowerCase()) === 0) {
eyedean marked this conversation as resolved.
Show resolved Hide resolved
const pathLowerCase = path.toLowerCase()
const baseLowerCase = base.toLowerCase()
// base="/a" shouldn't turn path="/app" into "/a/pp"
// https://github.com/vuejs/vue-router/issues/3555
// so we ensure the trailing slash in the base
if (base && ((pathLowerCase === baseLowerCase) ||
(pathLowerCase.indexOf(cleanPath(baseLowerCase + '/')) === 0))) {
path = path.slice(base.length)
}
return (path || '/') + window.location.search + window.location.hash
Expand Down