luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 21:33:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #483 from ThibG/glitch-soc/fixes/modal

Browse source 
Fix modals testing for props.noEsc (fixes #482)
This commit is contained in:
ThibG 2018-05-15 10:52:07 +02:00 committed by GitHub
parent 939ea456d2 dfa60cb0a8
commit f47f6c3345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/components/modal_root.js
View file

@ -59,7 +59,7 @@ export default class ModalRoot extends React.PureComponent {
const visible = !!type; const visible = !!type;
return ( return (
<Base onClose={onClose} noEsc={props.noEsc}> <Base onClose={onClose} noEsc={props ? props.noEsc : false}>
{visible && ( {visible && (
<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}> <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
{(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />} {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />}