OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

incorporate review

pull/21833/head
Matthew Hodgson 2016-03-21 15:45:04 +00:00
parent d54a75c913
commit c3e96f8af1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/HtmlUtils.js
View File

@ -47,12 +47,12 @@ var sanitizeHtmlParams = {
transformTags: { // custom to matrix
// add blank targets to all hyperlinks except vector URLs
'a': function(tagName, attribs) {
var m = attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN);
var m = attribs.href ? attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN) : null;
if (m) {
return { tagName: 'a', attribs: { href: attribs.href } };
return { tagName: 'a', attribs: { href: attribs.href, name: attribs.name } };
}
else {
return { tagName: 'a', attribs: { href: attribs.href, target: '_blank'} };
return { tagName: 'a', attribs: { href: attribs.href, name: attribs.name, target: '_blank' } };
}
},
},

6
src/linkify-matrix.js
View File

@ -106,7 +106,7 @@ var escapeRegExp = function(string) {
// as if someone explicitly links to vector.im/develop and we're on vector.im/beta
// they may well be trying to get us to explicitly go to develop.
// FIXME: intercept matrix.to URLs as well.
matrixLinkify.VECTOR_URL_PATTERN = "(https?:\/\/)?" + escapeRegExp(window.location.host + window.location.pathname);
matrixLinkify.VECTOR_URL_PATTERN = "^(https?:\/\/)?" + escapeRegExp(window.location.host + window.location.pathname);
matrixLinkify.options = {
events: function (href, type) {
@ -146,9 +146,7 @@ matrixLinkify.options = {
return '_blank';
}
}
else {
return '_blank';
}
return null;
},
};