mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-05-18 10:55:45 +00:00
commit 2025cc7747
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
electron_app/src/webcontents-handler.js
View file

@ -61,7 +61,8 @@ function onLinkContextMenu(ev, params) {
clipboard.writeText(url); clipboard.writeText(url);
}, },
})); }));
popupMenu.popup(); // popup() requires an options object even for no options
popupMenu.popup({});
ev.preventDefault(); ev.preventDefault();
} }
@ -88,7 +89,8 @@ function onSelectedContextMenu(ev, params) {
const items = _CutCopyPasteSelectContextMenus(params); const items = _CutCopyPasteSelectContextMenus(params);
const popupMenu = Menu.buildFromTemplate(items); const popupMenu = Menu.buildFromTemplate(items);
popupMenu.popup(); // popup() requires an options object even for no options
popupMenu.popup({});
ev.preventDefault(); ev.preventDefault();
} }
@ -101,7 +103,8 @@ function onEditableContextMenu(ev, params) {
const popupMenu = Menu.buildFromTemplate(items); const popupMenu = Menu.buildFromTemplate(items);
popupMenu.popup(); // popup() requires an options object even for no options
popupMenu.popup({});
ev.preventDefault(); ev.preventDefault();
} }