Skip to content

Unclosable dialog#7937

Merged
islemaster merged 3 commits into
stagingfrom
unclosable_dialog
Apr 19, 2016
Merged

Unclosable dialog#7937
islemaster merged 3 commits into
stagingfrom
unclosable_dialog

Conversation

@islemaster

Copy link
Copy Markdown
Contributor

Also broken out of #7905: A simple adjustment to the Dialog giving it an 'uncloseable' mode and allowing it to accept and render more than one child element.

Comment thread apps/src/templates/DialogComponent.jsx Outdated
<div tabIndex="-1" className="modal dash_modal in" ref="dialog" onKeyDown={this.closeOnEscape}>
<div className="modal-body dash_modal_body">
<div id="x-close" className="x-close" onClick={this.closeDialog}></div>
{this.props.uncloseable || <div id="x-close" className="x-close" onClick={this.closeDialog}></div>}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to see this written as !this.props.uncloseable && <div .../> though I'm not sure I can fully justify why. I think maybe because it makes more sense for me to have an expression result in false and display nothing than it does to result in true and display nothing.

@Bjvanminnen

Copy link
Copy Markdown
Contributor

lgtm modulo one comment.

@islemaster islemaster merged commit b135c34 into staging Apr 19, 2016
@islemaster islemaster deleted the unclosable_dialog branch April 19, 2016 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants