diff options
Diffstat (limited to 'lib/url.js')
-rw-r--r-- | lib/url.js | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/url.js b/lib/url.js index df04ebc12aa..52c39038767 100644 --- a/lib/url.js +++ b/lib/url.js @@ -879,7 +879,7 @@ Object.defineProperty(Url.prototype, 'port', { return null; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._port = -1; if (this._host) this._host = null; @@ -941,7 +941,7 @@ Object.defineProperty(Url.prototype, 'path', { return (p == null && s) ? ('/' + s) : null; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._pathname = this._search = null; return; } @@ -973,7 +973,7 @@ Object.defineProperty(Url.prototype, 'protocol', { return proto; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._protocol = null; } else { var proto = '' + v; @@ -1001,7 +1001,7 @@ Object.defineProperty(Url.prototype, 'href', { var parsesQueryStrings = this._parsesQueryStrings; // Reset properties. Url.call(this); - if (!isConsideredEmpty(v)) + if (v !== null && v !== '') this.parse('' + v, parsesQueryStrings, false); }, enumerable: true, @@ -1013,7 +1013,7 @@ Object.defineProperty(Url.prototype, 'auth', { return this._auth; }, set: function(v) { - this._auth = isConsideredEmpty(v) ? null : '' + v; + this._auth = v === null ? null : '' + v; this._href = ''; }, enumerable: true, @@ -1026,7 +1026,7 @@ Object.defineProperty(Url.prototype, 'host', { return this._host; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._port = -1; this._hostname = this._host = null; } else { @@ -1053,7 +1053,7 @@ Object.defineProperty(Url.prototype, 'hostname', { return this._hostname; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._hostname = null; if (this._hasValidPort()) @@ -1080,7 +1080,7 @@ Object.defineProperty(Url.prototype, 'hash', { return this._hash; }, set: function(v) { - if (isConsideredEmpty(v) || v === '#') { + if (v === null) { this._hash = null; } else { var hash = '' + v; @@ -1100,7 +1100,7 @@ Object.defineProperty(Url.prototype, 'search', { return this._search; }, set: function(v) { - if (isConsideredEmpty(v) || v === '?') { + if (v === null) { this._search = this._query = null; } else { var search = escapeSearch('' + v); @@ -1125,7 +1125,7 @@ Object.defineProperty(Url.prototype, 'pathname', { return this._pathname; }, set: function(v) { - if (isConsideredEmpty(v)) { + if (v === null) { this._pathname = null; } else { var pathname = escapePathName('' + v).replace(/\\/g, '/'); @@ -1144,10 +1144,6 @@ Object.defineProperty(Url.prototype, 'pathname', { configurable: true }); -function isConsideredEmpty(value) { - return value === null || value === undefined || value === ''; -} - // Search `char1` (integer code for a character) in `string` // starting from `fromIndex` and ending at `string.length - 1` // or when a stop character is found. |