Skip to content

Commit af3c270

Browse files
committed
Fix bug with react icon removal from DOM
1 parent cc79c3e commit af3c270

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
config/react.php
22
config/defines.php
3+
assests.json
34
\#*
45
*~
56
*.log

javascript/DeviceForms/Base.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
44
import InputField from '../FormMixin/InputField.jsx'
55
import SelectFilter from '../FormMixin/SelectFilter.jsx'
66
import Device from '../Mixin/Device.js'
7-
import UserSearch from '../Search/UserSearch.jsx'
7+
import UserSearch from '../Mixin/UserSearch.jsx'
88

99
export default class Base extends Component {
1010
constructor(props) {
@@ -57,7 +57,7 @@ export default class Base extends Component {
5757
value={device[varname] ? device[varname] : inputvalue}
5858
placeholder={placeholder}
5959
errorMessage={this.errorMessage(varname, label)}
60-
required={required ? required : Device.isRequired(device, varname)}
60+
required={Device.isRequired(device, varname)}
6161
label={label}
6262
change={update.bind(null, varname)}/>)
6363
}
@@ -71,7 +71,7 @@ export default class Base extends Component {
7171
value={device[varname] ? device[varname] : inputvalue}
7272
placeholder={placeholder}
7373
errorMessage={this.errorMessage(varname, label)}
74-
required={required ? required : Device.isRequired(device, varname)}
74+
required={Device.isRequired(device, varname)}
7575
setName={this.updateName}
7676
label={label}/>)
7777
}

javascript/FormMixin/InputField.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ inputClass = 'form-control error-highlight'
7777
inputClass = 'form-control'
7878
}
7979
let required = this.props.required
80-
? <RequiredIcon/>
81-
: null
80+
? <span>&nbsp;<i className="fa fa-asterisk text-danger"></i></span>
81+
: null
8282

8383
let input = (<input
8484
id={this.props.iid}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export default class UserSearch extends Component {
109109
className: inputClass
110110
};
111111

112-
let required = this.props.required ? <RequiredIcon/> : null
112+
let required = this.props.required ? <span>&nbsp;<i className="fa fa-asterisk text-danger"></i></span> : null
113113

114114
return (
115115
<div className="form-group">

0 commit comments

Comments
 (0)