commit | 7d335da86625ef67a805b988118af5ff6d82d92f | [log] [tgz] |
---|---|---|
author | Kasper Nilsson <kaspern@google.com> | Mon Nov 12 18:04:40 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 12 18:04:40 2018 +0000 |
tree | d6605a0e0b686f12328ccf10c8be0967e68542e8 | |
parent | df2a0c888d02c2b98b214e0c2753b85c2c06c5e5 [diff] | |
parent | 8e8466f45ac5d4d0f5a911f211ebcba704e42c4d [diff] |
Merge "Fix Top Menu Url"
diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js index dcb428f..3d9d36b 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js +++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js
@@ -229,7 +229,7 @@ if (typeof link.url === 'undefined') { return ''; } - if (link.target) { + if (link.target || !link.url.startsWith('/')) { return link.url; } return this._computeRelativeURL(link.url);
diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.html b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.html index 456f235..7bb4dce 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.html +++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.html
@@ -73,6 +73,12 @@ test('link URLs', () => { assert.equal( + element._computeLinkURL({url: 'http://example.com/test'}), + 'http://example.com/test'); + assert.equal( + element._computeLinkURL({url: 'https://example.com/test'}), + 'https://example.com/test'); + assert.equal( element._computeLinkURL({url: '/test'}), '//' + window.location.host + '/test'); assert.equal(