Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/extras/geocoder.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class GeocoderFieldComponent extends FieldType {
onChange={this.onChange.bind(this)}
onBlur={() => this.props.onChange(this.state.value)}
componentClass={'input'}
{...this.passProps}
{...this.props.passProps}
/>
{this.props.errorMessage &&
<HelpBlock>{this.props.errorMessage}</HelpBlock>
Expand All @@ -167,7 +167,7 @@ class GeocoderFieldComponent extends FieldType {
query={{
v: `3`,
libraries: 'geometry,drawing,places',
key: this.passProps.apiKey
key: this.props.passProps.apiKey
}}
loadingElement={
<div>
Expand Down
4 changes: 2 additions & 2 deletions src/fields/autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AutocompleteFieldComponent extends React.Component {
super(props);
this.state = {
value: props.value,
multi: (this.passProps && this.passProps.multi) || false
multi: (props.passProps && props.passProps.multi) || false
};
}

Expand Down Expand Up @@ -58,7 +58,7 @@ class AutocompleteFieldComponent extends React.Component {
onBlur={() => this.props.onChange(this.state.value)}
disabled={this.props.disabled}
placeholder={this.props.placeholder || this.props.passProps.placeholder}
{...this.passProps}
{...this.props.passProps}
/>
{this.props.errorMessage &&
<HelpBlock>{this.props.errorMessage}</HelpBlock>
Expand Down
2 changes: 1 addition & 1 deletion src/fields/datetime.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DateTimeFieldComponent extends React.Component {
inputProps={{
placeholder: this.props.placeholder || this.props.passProps.placeholder
}}
{...this.passProps}
{...this.props.passProps}
/>
{this.props.errorMessage &&
<HelpBlock>{this.props.errorMessage}</HelpBlock>
Expand Down
2 changes: 1 addition & 1 deletion src/fields/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class SelectFieldComponent extends React.Component {
onChange={this.onChange.bind(this)}
onBlur={() => this.props.onChange(this.state.value)}
componentClass="select"
{...this.passProps}
{...this.props.passProps}
>
{this.renderItems()}
</FormControl>
Expand Down
4 changes: 2 additions & 2 deletions src/fields/string.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class TextFieldComponent extends React.Component {
}

render() {
var fieldType = this.props.fieldType || this.type;
const fieldType = this.props.fieldType || this.type;
return (
<FormGroup
validationState={this.props.errorMessage ? 'error' : undefined}
Expand All @@ -53,7 +53,7 @@ export default class TextFieldComponent extends React.Component {
onKeyDown={this.onKeyDown.bind(this)}
onBlur={() => this.props.onChange(this.state.value)}
componentClass={fieldType === 'textarea' ? 'textarea' : 'input'}
{...this.passProps}
{...this.props.passProps}
/>
{this.props.errorMessage &&
<HelpBlock>{this.props.errorMessage}</HelpBlock>
Expand Down
2 changes: 1 addition & 1 deletion src/fields/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TagsFieldComponent extends React.Component {
ref='input'
value={this.state.value}
onChange={this.onChange.bind(this)}
{...this.passProps}
{...this.props.passProps}
/>
{this.props.errorMessage &&
<HelpBlock>{this.props.errorMessage}</HelpBlock>
Expand Down