diff options
Diffstat (limited to 'lib/url.js')
| -rw-r--r-- | lib/url.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/url.js b/lib/url.js index 665bd43614..7a268cd438 100644 --- a/lib/url.js +++ b/lib/url.js @@ -765,13 +765,13 @@ Url.prototype.resolveObject = function resolveObject(relative) { const isSourceAbs = (result.pathname && result.pathname.charAt(0) === '/'); const isRelAbs = ( - relative.host || relative.pathname && relative.pathname.charAt(0) === '/' + relative.host || (relative.pathname && relative.pathname.charAt(0) === '/') ); var mustEndAbs = (isRelAbs || isSourceAbs || (result.host && relative.pathname)); const removeAllDots = mustEndAbs; - var srcPath = result.pathname && result.pathname.split('/') || []; - const relPath = relative.pathname && relative.pathname.split('/') || []; + var srcPath = (result.pathname && result.pathname.split('/')) || []; + const relPath = (relative.pathname && relative.pathname.split('/')) || []; const noLeadingSlashes = result.protocol && !slashedProtocol.has(result.protocol); @@ -869,8 +869,8 @@ Url.prototype.resolveObject = function resolveObject(relative) { // then it must NOT get a trailing slash. var last = srcPath.slice(-1)[0]; const hasTrailingSlash = ( - (result.host || relative.host || srcPath.length > 1) && - (last === '.' || last === '..') || last === ''); + ((result.host || relative.host || srcPath.length > 1) && + (last === '.' || last === '..')) || last === ''); // Strip single dots, resolve double dots to parent dir // if the path tries to go above the root, `up` ends up > 0 |