phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[MM-50410] Allow any unhandled target=_blank links to open in the browser (#2548)

Browse Source
This commit is contained in:
Devin Binnie
2023-02-09 09:03:32 -05:00
committed by GitHub
parent 06eb76dc21
commit 6dca4a5095
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/views/webContentEvents.test.js
View File

@@ -250,5 +250,11 @@ describe('main/views/webContentsEvents', () => {
expect(newWindow({url: 'http://server-1.com/trusted/login'})).toStrictEqual({action: 'deny'}); expect(newWindow({url: 'http://server-1.com/trusted/login'})).toStrictEqual({action: 'deny'});
expect(webContentsEventManager.popupWindow).toBeTruthy(); expect(webContentsEventManager.popupWindow).toBeTruthy();
}); });
it('should open external URIs in browser', () => {
urlUtils.isValidURI.mockReturnValue(false);
expect(newWindow({url: 'https://google.com'})).toStrictEqual({action: 'deny'});
expect(shell.openExternal).toBeCalledWith('https://google.com');
});
}); });
}); });

5
src/main/views/webContentEvents.ts
View File

@@ -133,7 +133,6 @@ export class WebContentsEventManager {
} }
const serverURL = WindowManager.getServerURLFromWebContentsId(webContentsId); const serverURL = WindowManager.getServerURLFromWebContentsId(webContentsId);
if (!serverURL) { if (!serverURL) {
shell.openExternal(details.url); shell.openExternal(details.url);
return {action: 'deny'}; return {action: 'deny'};
@@ -206,8 +205,12 @@ export class WebContentsEventManager {
const contextMenu = new ContextMenu({}, this.popupWindow); const contextMenu = new ContextMenu({}, this.popupWindow);
contextMenu.reload(); contextMenu.reload();
return {action: 'deny'};
} }
// If all else fails, just open externally
shell.openExternal(details.url);
return {action: 'deny'}; return {action: 'deny'};
}; };
}; };