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

Merge pull request #3522 from matrix-org/t3chguy/backspace_cider_focus

Browse source 
Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)
This commit is contained in:
Michael Telatynski 2019-10-04 11:57:06 +01:00 committed by GitHub
commit b1b4139163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Keyboard.js
View file

@ -66,7 +66,10 @@ export const Key = {
End: "End", End: "End",
PAGE_UP: "PageUp", PAGE_UP: "PageUp",
PAGE_DOWN: "PageDown", PAGE_DOWN: "PageDown",
BACKSPACE: "Backspace",
BACKTICK: "`", BACKTICK: "`",
SPACE: " ",
ENTER: "Enter",
K: "k", K: "k",
}; };

5
src/components/structures/LoggedInView.js
View file

@ -399,10 +399,11 @@ const LoggedInView = createReactClass({
ev.preventDefault(); ev.preventDefault();
} else if (!hasModifier) { } else if (!hasModifier) {
const isClickShortcut = ev.target !== document.body && const isClickShortcut = ev.target !== document.body &&
(ev.key === "Space" || ev.key === "Enter"); (ev.key === Key.SPACE || ev.key === Key.ENTER);
// XXX: Remove after CIDER replaces Slate completely: https://github.com/vector-im/riot-web/issues/11036 // XXX: Remove after CIDER replaces Slate completely: https://github.com/vector-im/riot-web/issues/11036
if (ev.key === "Backspace") { // If using Slate, consume the Backspace without first focusing as it causes an implosion
if (ev.key === Key.BACKSPACE && !SettingsStore.getValue("useCiderComposer")) {
ev.stopPropagation(); ev.stopPropagation();
return; return;
} }