From cf9ccaa390f17246fc67d3aea35bb5b0f2818f43 Mon Sep 17 00:00:00 2001 From: xujiongbo Date: Wed, 29 Mar 2017 10:17:11 +0800 Subject: [PATCH] small tweaks on resolvePath function --- src/util/path.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/util/path.js b/src/util/path.js index 513689a3f..8e110343b 100644 --- a/src/util/path.js +++ b/src/util/path.js @@ -5,11 +5,12 @@ export function resolvePath ( base: string, append?: boolean ): string { - if (relative.charAt(0) === '/') { + const firstChar = relative.charAt(0) + if (firstChar === '/') { return relative } - if (relative.charAt(0) === '?' || relative.charAt(0) === '#') { + if (firstChar === '?' || firstChar === '#') { return base + relative } @@ -26,11 +27,9 @@ export function resolvePath ( const segments = relative.replace(/^\//, '').split('/') for (let i = 0; i < segments.length; i++) { const segment = segments[i] - if (segment === '.') { - continue - } else if (segment === '..') { + if (segment === '..') { stack.pop() - } else { + } else if (segment !== '.') { stack.push(segment) } }