OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3515 from matrix-org/t3chguy/fix_backspace_slate_death 

Fix backspace without slate focus killing everything
pull/21833/head
Michael Telatynski 2019-10-03 21:31:58 +01:00 committed by GitHub
parent 359d2fee5f a9b4abaf78
commit e4691ced97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/LoggedInView.js
View File

@ -401,6 +401,12 @@ const LoggedInView = createReactClass({
const isClickShortcut = ev.target !== document.body && const isClickShortcut = ev.target !== document.body &&
(ev.key === "Space" || ev.key === "Enter"); (ev.key === "Space" || ev.key === "Enter");
// XXX: Remove after CIDER replaces Slate completely: https://github.com/vector-im/riot-web/issues/11036
if (ev.key === "Backspace") {
ev.stopPropagation();
return;
}
if (!isClickShortcut && !canElementReceiveInput(ev.target)) { if (!isClickShortcut && !canElementReceiveInput(ev.target)) {
// synchronous dispatch so we focus before key generates input // synchronous dispatch so we focus before key generates input
dis.dispatch({action: 'focus_composer'}, true); dis.dispatch({action: 'focus_composer'}, true);