opendev/gerrit
Code Issues Proposed changes

Fix regex in link-text-parser

Browse Source 
Change-Id: Idccdf04073367dd912fec35f902977e2b39f26d8
This commit is contained in:
Paladox none
2019-09-30 12:45:58 +00:00
parent 6c95cb4495
commit 69cbcb1c6c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
polygerrit-ui/app/elements/shared/gr-linked-text/gr-linked-text_test.html
View File

@@ -69,6 +69,10 @@ limitations under the License.
match: 'test (.+)',
html: '<a href="/r/awesomesauce">$1</a>',
},
anotatstartwithbaseurl: {
match: 'a test (.+)',
html: '[Lookup: <a href="/r/awesomesauce">$1</a>]',
},
disabledconfig: {
match: 'foo:(.+)',
link: 'https://google.com/search?q=$1',
@@ -212,6 +216,15 @@ limitations under the License.
assert.equal(linkEl.textContent, 'foo');
});
test('a is not at start', function() {
window.CANONICAL_PATH = '/r';
element.content = 'a test foo';
const linkEl = element.$.output.childNodes[1];
assert.isTrue(linkEl.href.endsWith('/r/awesomesauce'));
assert.equal(linkEl.textContent, 'foo');
});
test('hash html with base url', function() {
window.CANONICAL_PATH = '/r';

2
polygerrit-ui/app/elements/shared/gr-linked-text/link-text-parser.js
View File

@@ -109,7 +109,7 @@ GrLinkTextParser.prototype.addHTML =
function(html, position, length, outputArray) {
if (!this.hasOverlap(position, length, outputArray)) {
if (!!this.baseUrl && html.match(/<a href=\"\//g) &&
!new RegExp(`^<a href="${this.baseUrl}`, 'g').test(html)) {
!new RegExp(`<a href="${this.baseUrl}`, 'g').test(html)) {
html = html.replace(/<a href=\"\//g, `<a href=\"${this.baseUrl}\/`);
}
this.addItem(null, null, html, position, length, outputArray);