toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed Markdown links when SiteURL isn't configured (#1650)

Browse source
This commit is contained in:
Harrison Healey 2018-05-03 09:08:36 -04:00 committed by Saturnino Abril
parent b2b554d40c
commit 29d015bd32
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/components/markdown/markdown_link/markdown_link.js
View file

@ -43,23 +43,28 @@ export default class MarkdownLink extends PureComponent {
return;
}
const pattern = new RegExp('^' + escapeRegex(serverURL) + '\\/([^\\/]+)\\/pl\\/(\\w+)');
const sitePattern = new RegExp('^' + escapeRegex(siteURL) + '\\/([^\\/]+)\\/pl\\/(\\w+)');
const match = url.match(pattern) || url.match(sitePattern);
const match = this.matchPermalink(url, serverURL) || this.matchPermalink(url, siteURL);
if (!match) {
if (match) {
const teamName = match[1];
const postId = match[2];
onPermalinkPress(postId, teamName);
} else {
Linking.canOpenURL(url).then((supported) => {
if (supported) {
Linking.openURL(url);
}
});
return;
}
});
matchPermalink = (link, rootURL) => {
if (!rootURL) {
return null;
}
const teamName = match[1];
const postId = match[2];
onPermalinkPress(postId, teamName);
});
return new RegExp('^' + escapeRegex(rootURL) + '\\/([^\\/]+)\\/pl\\/(\\w+)').exec(link);
}
parseLinkLiteral = (literal) => {
let nextLiteral = literal;