diff options
author | Corey Hulen <corey@hulen.com> | 2017-03-23 19:41:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 19:41:08 -0700 |
commit | 98baf1536eb1b47d8258e188e1c80393182c6525 (patch) | |
tree | 2c60ec6c40fb6e328de980be97e67b76d06db5cb | |
parent | 6935e2d5ea73d34f0f383715fd161059eff74608 (diff) | |
download | chat-98baf1536eb1b47d8258e188e1c80393182c6525.tar.gz chat-98baf1536eb1b47d8258e188e1c80393182c6525.tar.bz2 chat-98baf1536eb1b47d8258e188e1c80393182c6525.zip |
Fixing issue with ids for selenium (#5859)
* Fixing issue with ids for selenium
* removing comment
-rw-r--r-- | webapp/components/setting_item_max.jsx | 2 | ||||
-rw-r--r-- | webapp/components/setting_item_min.jsx | 5 | ||||
-rw-r--r-- | webapp/utils/utils.jsx | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/webapp/components/setting_item_max.jsx b/webapp/components/setting_item_max.jsx index 9f3c4f0cf..2da500394 100644 --- a/webapp/components/setting_item_max.jsx +++ b/webapp/components/setting_item_max.jsx @@ -107,7 +107,7 @@ export default class SettingItemMax extends React.Component { {clientError} {submit} <a - id={this.props.title + 'Cancel'} + id={Utils.createSafeId(this.props.title.toString() + 'Cancel')} className='btn btn-sm' href='#' onClick={this.props.updateSection} diff --git a/webapp/components/setting_item_min.jsx b/webapp/components/setting_item_min.jsx index 4f756c46e..da86ed4a7 100644 --- a/webapp/components/setting_item_min.jsx +++ b/webapp/components/setting_item_min.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. import {FormattedMessage} from 'react-intl'; +import * as Utils from 'utils/utils.jsx'; import React from 'react'; @@ -12,7 +13,7 @@ export default class SettingItemMin extends React.Component { editButton = ( <li className='col-xs-12 col-sm-3 section-edit'> <a - id={this.props.title} + id={Utils.createSafeId(this.props.title.toString() + 'Edit')} className='theme' href='#' onClick={this.props.updateSection} @@ -35,7 +36,7 @@ export default class SettingItemMin extends React.Component { <li className='col-xs-12 col-sm-9 section-title'>{this.props.title}</li> {editButton} <li - id={this.props.title + 'Desc'} + id={Utils.createSafeId(this.props.title.toString() + 'Desc')} className='col-xs-12 section-describe' > {this.props.describe} diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index b3370e88c..820f1a1c7 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -31,6 +31,14 @@ export function isMac() { return navigator.platform.toUpperCase().indexOf('MAC') >= 0; } +export function createSafeId(str) { + if (str === null) { + return null; + } + + return str.replace(' ', '_'); +} + export function cmdOrCtrlPressed(e) { return (isMac() && e.metaKey) || (!isMac() && e.ctrlKey && !e.altKey); } |