diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:51:04 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:51:04 -0400 |
commit | 5f7be5c1d3c3cf2aec60c90c9ff9e2b1f0f81f1b (patch) | |
tree | 18a8fd1d95b9b232a4968291d408bf78eee60d3a /web/react/components/setting_item_min.jsx | |
parent | ca6f4e9d034e26a9b2e3051903c5276a4bd12be0 (diff) | |
parent | fb9e891246db3b8b69e70697d29be5b36b8c7578 (diff) | |
download | chat-5f7be5c1d3c3cf2aec60c90c9ff9e2b1f0f81f1b.tar.gz chat-5f7be5c1d3c3cf2aec60c90c9ff9e2b1f0f81f1b.tar.bz2 chat-5f7be5c1d3c3cf2aec60c90c9ff9e2b1f0f81f1b.zip |
Merge pull request #374 from nickago/MM-1299
MM-1299 Fixes problem of two notification sounds in firefox
Diffstat (limited to 'web/react/components/setting_item_min.jsx')
-rw-r--r-- | web/react/components/setting_item_min.jsx | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx index 2209c74d1..3c87e416e 100644 --- a/web/react/components/setting_item_min.jsx +++ b/web/react/components/setting_item_min.jsx @@ -2,12 +2,23 @@ // See License.txt for license information. module.exports = React.createClass({ + displayName: 'SettingsItemMin', + propTypes: { + title: React.PropTypes.string, + disableOpen: React.PropTypes.bool, + updateSection: React.PropTypes.func, + describe: React.PropTypes.string + }, render: function() { + var editButton = ''; + if (!this.props.disableOpen) { + editButton = <li className='col-sm-2 section-edit'><a className='section-edit theme' href='#' onClick={this.props.updateSection}>Edit</a></li>; + } return ( - <ul className="section-min"> - <li className="col-sm-10 section-title">{this.props.title}</li> - <li className="col-sm-2 section-edit"><a className="section-edit theme" href="#" onClick={this.props.updateSection}>Edit</a></li> - <li className="col-sm-7 section-describe">{this.props.describe}</li> + <ul className='section-min'> + <li className='col-sm-10 section-title'>{this.props.title}</li> + {editButton} + <li className='col-sm-7 section-describe'>{this.props.describe}</li> </ul> ); } |