Skip to content

Commit 969f289

Browse files
authored
Merge pull request #5531 from Polymer/resolve-url
Check directly for // in resolveUrl because it isn't a valid URL
2 parents 733cf68 + 5537380 commit 969f289

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

lib/utils/resolve-url.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ export function resolveUrl(url, baseURI) {
2828
if (url && ABS_URL.test(url)) {
2929
return url;
3030
}
31+
if (url === '//') {
32+
return url;
33+
}
3134
// Lazy feature detection.
3235
if (workingURL === undefined) {
3336
workingURL = false;

test/unit/resolveurl.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,14 @@
162162
assert.equal(actual, expected);
163163
});
164164

165+
test('resolveUrl when called with //', function () {
166+
const el = document.querySelector('x-resolve');
167+
const expected = '//';
168+
const actual =
169+
el.resolveUrl('//', 'https://example.org/bar');
170+
assert.equal(actual, expected);
171+
});
172+
165173
test('resolveUrl api with assetpath', function() {
166174
var el = document.createElement('p-r-ap');
167175
// Manually calculate expected URL, to avoid dependence on

0 commit comments

Comments
 (0)