matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

don't change URL bar when clicking on linkified rooms or users.

Browse Source 
be aware of /user paths.
This commit is contained in:
Matthew Hodgson
2016-08-28 02:05:23 +01:00
parent ad873c2b60
commit de82ac3bc0
3 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/linkify-matrix.js
View File

@@ -96,8 +96,8 @@ function matrixLinkify(linkify) {
}
// stubs, overwritten in MatrixChat's componentDidMount
// matrixLinkify.onUserClick = function(e, userId) { e.preventDefault(); };
// matrixLinkify.onAliasClick = function(e, roomAlias) { e.preventDefault(); };
matrixLinkify.onUserClick = function(e, userId) { e.preventDefault(); };
matrixLinkify.onAliasClick = function(e, roomAlias) { e.preventDefault(); };
var escapeRegExp = function(string) {
return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -113,7 +113,6 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@).*)";
matrixLinkify.options = {
/*
events: function (href, type) {
switch (type) {
case "userid":
@@ -130,7 +129,7 @@ matrixLinkify.options = {
};
}
},
*/
formatHref: function (href, type) {
switch (type) {
case 'roomalias':
@@ -148,9 +147,9 @@ matrixLinkify.options = {
if (m) {
var entity = m[1];
if (entity[0] === '@') {
return '#'; // TODO
return '#/user/' + entity;
}
else if (entity[0] === '#') {
else if (entity[0] === '#' || entity[0] === '!') {
return '#/room/' + entity;
}
}