Handle encoded matrix urls
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
This commit is contained in:
parent
c0f8098a86
commit
f2d0a56c1f
2 changed files with 4 additions and 4 deletions
|
@ -255,7 +255,7 @@ matrixLinkify.options = {
|
||||||
target: function(href, type) {
|
target: function(href, type) {
|
||||||
if (type === 'url') {
|
if (type === 'url') {
|
||||||
const transformed = tryTransformPermalinkToLocalHref(href);
|
const transformed = tryTransformPermalinkToLocalHref(href);
|
||||||
if (transformed !== href || href.match(matrixLinkify.ELEMENT_URL_PATTERN)) {
|
if (transformed !== href || decodeURIComponent(href).match(matrixLinkify.ELEMENT_URL_PATTERN)) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return '_blank';
|
return '_blank';
|
||||||
|
|
|
@ -337,7 +337,7 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
|
||||||
return permalink;
|
return permalink;
|
||||||
}
|
}
|
||||||
|
|
||||||
const m = permalink.match(matrixLinkify.ELEMENT_URL_PATTERN);
|
const m = decodeURIComponent(permalink).match(matrixLinkify.ELEMENT_URL_PATTERN);
|
||||||
if (m) {
|
if (m) {
|
||||||
return m[1];
|
return m[1];
|
||||||
}
|
}
|
||||||
|
@ -402,8 +402,8 @@ function getPermalinkConstructor(): PermalinkConstructor {
|
||||||
|
|
||||||
export function parsePermalink(fullUrl: string): PermalinkParts {
|
export function parsePermalink(fullUrl: string): PermalinkParts {
|
||||||
const elementPrefix = SdkConfig.get()['permalinkPrefix'];
|
const elementPrefix = SdkConfig.get()['permalinkPrefix'];
|
||||||
if (fullUrl.startsWith(matrixtoBaseUrl)) {
|
if (decodeURIComponent(fullUrl).startsWith(matrixtoBaseUrl)) {
|
||||||
return new SpecPermalinkConstructor().parsePermalink(fullUrl);
|
return new SpecPermalinkConstructor().parsePermalink(decodeURIComponent(fullUrl));
|
||||||
} else if (elementPrefix && fullUrl.startsWith(elementPrefix)) {
|
} else if (elementPrefix && fullUrl.startsWith(elementPrefix)) {
|
||||||
return new ElementPermalinkConstructor(elementPrefix).parsePermalink(fullUrl);
|
return new ElementPermalinkConstructor(elementPrefix).parsePermalink(fullUrl);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue