| commit | b8635e4063a0ca78c23f4d14e3f17af7938accb3 | [log] [tgz] |
|---|---|---|
| author | Paladox none <thomasmulhall410@yahoo.com> | Mon Nov 12 19:53:18 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 12 19:53:18 2018 +0000 |
| tree | c07d14a375d154238eaa81866337c59f195172b2 | |
| parent | 5fb6e722d7d025f3b0eac653c9a3d4fbd2fab895 [diff] | |
| parent | 3a3a401ed9c8e3c42c1b5c65738d2dafc2c0e01a [diff] |
Merge "Fix Top Menu Url" into stable-2.16
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(