diff options
| author | Rich Trott <rtrott@gmail.com> | 2017-07-05 09:21:40 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2017-07-07 13:18:19 -0700 |
| commit | 0d22858d67f5f8f7959a55ceca23adafe12827d5 (patch) | |
| tree | 9a0ff22b8b20243a59cf5ba6fed1f4eeb3755a7f /lib/url.js | |
| parent | 49d13a17b10b45b3d23e0fed41783769124f239c (diff) | |
| download | android-node-v8-0d22858d67f5f8f7959a55ceca23adafe12827d5.tar.gz android-node-v8-0d22858d67f5f8f7959a55ceca23adafe12827d5.tar.bz2 android-node-v8-0d22858d67f5f8f7959a55ceca23adafe12827d5.zip | |
lib: remove excess indentation
In anticipation of stricter linting for indentation, remove instances of
extra indentation that will be flagged by the new rules.
PR-URL: https://github.com/nodejs/node/pull/14090
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 |