From 34e1a030b9b6a1921770f64d67e048727fce7b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Vay=C3=A1?= Date: Fri, 11 Sep 2020 22:18:30 +0200 Subject: [PATCH] [MM-28595] Open team links within the app (#1373) --- src/browser/components/MattermostView.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx index bf8f7935..62ba8473 100644 --- a/src/browser/components/MattermostView.jsx +++ b/src/browser/components/MattermostView.jsx @@ -94,7 +94,10 @@ export default class MattermostView extends React.Component { } else if (destURL.path.match(/^\/help\//)) { // continue to open special case internal urls in default browser shell.openExternal(e.url); - } else if (Utils.isTeamUrl(this.props.src, e.url, true) || Utils.isPluginUrl(this.props.src, e.url)) { + } else if (Utils.isTeamUrl(this.props.src, e.url, true)) { + e.preventDefault(); + this.webviewRef.current.loadURL(e.url); + } else if (Utils.isPluginUrl(this.props.src, e.url)) { // New window should disable nodeIntegration. window.open(e.url, remote.app.name, 'nodeIntegration=no, contextIsolation=yes, show=yes'); } else if (Utils.isManagedResource(this.props.src, e.url)) {