Merge pull request #4317 from matrix-org/t3chguy/fix_kbd_finnish

Fix Ctrl+/ for Finnish keyboard where it includes Shift
This commit is contained in:
Michael Telatynski 2020-04-01 10:30:39 +01:00 committed by GitHub
commit 7ba6462a5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,7 +22,7 @@ import createReactClass from 'create-react-class';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { DragDropContext } from 'react-beautiful-dnd'; import { DragDropContext } from 'react-beautiful-dnd';
import { Key, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard'; import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
import PageTypes from '../../PageTypes'; import PageTypes from '../../PageTypes';
import CallMediaHandler from '../../CallMediaHandler'; import CallMediaHandler from '../../CallMediaHandler';
import { fixupColorFonts } from '../../utils/FontManager'; import { fixupColorFonts } from '../../utils/FontManager';
@ -380,7 +380,7 @@ const LoggedInView = createReactClass({
break; break;
case Key.SLASH: case Key.SLASH:
if (ctrlCmdOnly) { if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev)) {
KeyboardShortcuts.toggleDialog(); KeyboardShortcuts.toggleDialog();
handled = true; handled = true;
} }