gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6763 from vector-im/dbkr/fix_electron_menus 

Fix right click menu in electron
This commit is contained in:
David Baker 2018-05-18 11:55:41 +01:00 committed by GitHub
parent 1e8bb5e852 6722eedf7a
commit e5fd579935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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();
} }