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

Fix the ctrl+e mute camera shortcut
matrix-org · Nov 8, 2016 · f2222c8 · f2222c8
2 parents 5a61a1e + a008f50
commit f2222c8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
@@ -358,18 +358,25 @@ module.exports = React.createClass({
     },
 
     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) {
             case KeyCode.KEY_D:
-                if (ev.ctrlKey) {
+                if (ctrlCmdOnly) {
                     this.onMuteAudioClick();
                     handled = true;
                 }
                 break;
 
             case KeyCode.KEY_E:
-                if (ev.ctrlKey) {
+                if (ctrlCmdOnly) {
                     this.onMuteVideoClick();
                     handled = true;
                 }