matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Fix the ctrl+e mute camera shortcut

Browse Source 
* Fixes the altgr+e shortcut on Windows
   (Fixes https://github.com/vector-im/vector-web/issues/2561)
 * Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
   which is more normal and doesn't clobber ctrl+e which old
   school unix types use for go-to-end-of-line.
This commit is contained in:
David Baker
2016-11-08 18:04:22 +00:00
parent 884ae0e218
commit a008f5010a
1 changed files with 10 additions and 3 deletions
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;
} }