OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/6792/head
Weblate 2018-05-18 11:18:14 +00:00
parent 2025cc7747 2e7da36af0
commit 8b0de948d0
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electron_app/src/webcontents-handler.js
View File

@ -35,12 +35,15 @@ function onLinkContextMenu(ev, params) {
const url = params.linkURL || params.srcURL; const url = params.linkURL || params.srcURL;
const popupMenu = new Menu(); const popupMenu = new Menu();
// No point trying to open blob: URLs in an external browser: it ain't gonna work.
if (!url.startsWith('blob:')) {
popupMenu.append(new MenuItem({ popupMenu.append(new MenuItem({
label: url, label: url,
click() { click() {
safeOpenURL(url); safeOpenURL(url);
}, },
})); }));
}
if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) { if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) {
popupMenu.append(new MenuItem({ popupMenu.append(new MenuItem({
@ -55,12 +58,15 @@ function onLinkContextMenu(ev, params) {
})); }));
} }
// No point offerring to copy a blob: URL either
if (!url.startsWith('blob:')) {
popupMenu.append(new MenuItem({ popupMenu.append(new MenuItem({
label: 'Copy Link Address', label: 'Copy Link Address',
click() { click() {
clipboard.writeText(url); clipboard.writeText(url);
}, },
})); }));
}
// popup() requires an options object even for no options // popup() requires an options object even for no options
popupMenu.popup({}); popupMenu.popup({});
ev.preventDefault(); ev.preventDefault();