mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-27 08:02:01 +00:00
match correct route when resolveComponents in hash mode
This commit is contained in:
parent
8dd1bfe169
commit
5616f1acba
@ -134,7 +134,7 @@ async function loadAsyncComponents (to, from, next) {
|
||||
|
||||
// Get matched components
|
||||
function resolveComponents(router) {
|
||||
const path = getLocation(router.options.base)
|
||||
const path = getLocation(router.options.base, router.options.mode)
|
||||
|
||||
return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
|
||||
// If component already resolved
|
||||
|
@ -144,8 +144,11 @@ export function promisify (fn, context) {
|
||||
}
|
||||
|
||||
// Imported from vue-router
|
||||
export function getLocation (base) {
|
||||
export function getLocation (base, mode) {
|
||||
var path = window.location.pathname
|
||||
if (mode === 'hash') {
|
||||
return window.location.hash.replace(/^#\//, '')
|
||||
}
|
||||
if (base && path.indexOf(base) === 0) {
|
||||
path = path.slice(base.length)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user