Skip to content

fix: resolve relative path#593

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

Closed
NoCLin wants to merge 2 commits into from
Closed

fix: resolve relative path #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1079cbb
fix: allow relative path (#590)
Jul 30, 2018
bee0db8
fix: resolve './' and '../' (#590)
Jul 31, 2018
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
12 changes: 10 additions & 2 deletions src/core/router/history/base.js
 100644 → 100755
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,8 @@ import {
isAbsolutePath,
stringifyQuery,
cleanPath,
replaceSlug
replaceSlug,
resolvePath
} from '../util'
import {noop, merge} from '../../util/core'

Expand DownExpand Up@@ -76,6 +77,13 @@ export class History {
(idIndex > 0 ? currentRoute.substr(0, idIndex) : currentRoute) + path
}

return cleanPath('/' + path)
if (path.startsWith('/')) {
return cleanPath(path)
}

if (currentRoute !== undefined) {
const currentDir = currentRoute.substr(0, currentRoute.lastIndexOf('/') + 1)
return cleanPath(resolvePath(currentDir + path))
}
}
}
16 changes: 16 additions & 0 deletions src/core/router/util.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,3 +60,19 @@ export function getPath(...args) {
export const replaceSlug = cached(path => {
return path.replace('#', '?id=')
})

export const resolvePath = cached(path => {
const segments = path.replace(/^\//, '').split('/')
let resolved = []

for (let i = 0, len = segments.length; i < len; i++) {
const segment = segments[i]

if (segment === '..') {
resolved.pop()
} else if (segment !== '.') {
resolved.push(segment)
}
}
return '/' + resolved.join('/')
})