diff options
Diffstat (limited to 'lib/url.js')
| -rw-r--r-- | lib/url.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/url.js b/lib/url.js index 70584f8d07..3af9e8f7bf 100644 --- a/lib/url.js +++ b/lib/url.js @@ -760,8 +760,7 @@ Url.prototype.resolveObject = function resolveObject(relative) { var isSourceAbs = (result.pathname && result.pathname.charAt(0) === '/'); var 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)); @@ -865,8 +864,8 @@ Url.prototype.resolveObject = function resolveObject(relative) { // then it must NOT get a trailing slash. var last = srcPath.slice(-1)[0]; var 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 |