PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e

Browse source 
Fix the ctrl+e mute camera shortcut
This commit is contained in:
Richard van der Hoff 2016-11-08 18:37:58 +00:00 committed by GitHub
commit f2222c84a8
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/RoomView.js
View file

@ -358,18 +358,25 @@ module.exports = React.createClass({
}, },
onKeyDown: function(ev) { onKeyDown: function(ev) {
var handled = false; let handled = false;
const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
let ctrlCmdOnly;
if (isMac) {
ctrlCmdOnly = ev.metaKey && !ev.altKey && !ev.ctrlKey && !ev.shiftKey;
} else {
ctrlCmdOnly = ev.ctrlKey && !ev.altKey && !ev.metaKey && !ev.shiftKey;
}
switch (ev.keyCode) { switch (ev.keyCode) {
case KeyCode.KEY_D: case KeyCode.KEY_D:
if (ev.ctrlKey) { if (ctrlCmdOnly) {
this.onMuteAudioClick(); this.onMuteAudioClick();
handled = true; handled = true;
} }
break; break;
case KeyCode.KEY_E: case KeyCode.KEY_E:
if (ev.ctrlKey) { if (ctrlCmdOnly) {
this.onMuteVideoClick(); this.onMuteVideoClick();
handled = true; handled = true;
} }