Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-18 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vue-app): decode uri in getlocation (#5337)

Browse Source
This commit is contained in:
Johan Roxendal 2019-03-23 09:40:38 +01:00 committed by Pooya Parsa
parent 71054e5f61
commit 77dcfe6ee8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vue-app/template/utils.js
View File

@ -259,14 +259,14 @@ export function promisify(fn, context) {
// Imported from vue-router // Imported from vue-router
export function getLocation(base, mode) { export function getLocation(base, mode) {
let path = window.location.pathname let path = decodeURI(window.location.pathname)
if (mode === 'hash') { if (mode === 'hash') {
return window.location.hash.replace(/^#\//, '') return window.location.hash.replace(/^#\//, '')
} }
if (base && path.indexOf(base) === 0) { if (base && path.indexOf(base) === 0) {
path = path.slice(base.length) path = path.slice(base.length)
} }
return decodeURI(path || '/') + window.location.search + window.location.hash return (path || '/') + window.location.search + window.location.hash
} }
export function urlJoin() { export function urlJoin() {

3
test/unit/unicode-base.test.js
View File

@ -19,8 +19,7 @@ describe('unicode-base', () => {
const window = await nuxt.server.renderAndGetWindow(url('/ö/')) const window = await nuxt.server.renderAndGetWindow(url('/ö/'))
const html = window.document.body.innerHTML const html = window.document.body.innerHTML
// important to have the actual page transition classes here -> page works, no hydration error expect(html).toContain('<h1>Unicode base works!</h1>')
expect(html).toContain('<h1 class="page-enter page-enter-active">Unicode base works!</h1>')
}) })
// Close server and ask nuxt to stop listening to file changes // Close server and ask nuxt to stop listening to file changes