ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't unconditionally call `preventDefault` and `stopPropagation` on all keyup events (#4777) 

* UploadArea should only preventDefault for Escape

This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.

* Remove workaround for fixed bug in SettingToggle

SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
rebase/4.0.0rc2
Surinna Curtis 2017-09-02 09:27:16 -05:00 committed by Eugen Rochko
parent 5e1e466da0
commit 8cc1ed3c55
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/features/notifications/components/setting_toggle.js
View File

@ -18,12 +18,6 @@ export default class SettingToggle extends React.PureComponent {
this.props.onChange(this.props.settingKey, target.checked); this.props.onChange(this.props.settingKey, target.checked);
} }
onKeyDown = e => {
if (e.key === ' ') {
this.props.onChange(this.props.settingKey, !e.target.checked);
}
}
render () { render () {
const { prefix, settings, settingKey, label, meta } = this.props; const { prefix, settings, settingKey, label, meta } = this.props;
const id = ['setting-toggle', prefix, ...settingKey].filter(Boolean).join('-'); const id = ['setting-toggle', prefix, ...settingKey].filter(Boolean).join('-');

5
app/javascript/mastodon/features/ui/components/upload_area.js
View File

@ -12,13 +12,12 @@ export default class UploadArea extends React.PureComponent {
}; };
handleKeyUp = (e) => { handleKeyUp = (e) => {
e.preventDefault();
e.stopPropagation();
const keyCode = e.keyCode; const keyCode = e.keyCode;
if (this.props.active) { if (this.props.active) {
switch(keyCode) { switch(keyCode) {
case 27: case 27:
e.preventDefault();
e.stopPropagation();
this.props.onClose(); this.props.onClose();
break; break;
} }