ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-24 22:17:25 +00:00
Code Issues Projects Releases Wiki Activity

Removed left over conflict markers and set default.

Browse Source
This commit is contained in:
orangemug
2019-10-26 17:41:56 +01:00
parent ea3b9a20c5
commit dddd604f7b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/inputs/NumberInput.jsx
+1 -2
View File
@@ -113,7 +113,6 @@ class NumberInput extends React.Component {
} }
render() { render() {
<<<<<<< HEAD
if( if(
this.props.hasOwnProperty("min") && this.props.hasOwnProperty("max") && this.props.hasOwnProperty("min") && this.props.hasOwnProperty("max") &&
this.props.min !== undefined && this.props.max !== undefined && this.props.min !== undefined && this.props.max !== undefined &&
@@ -149,7 +148,7 @@ class NumberInput extends React.Component {
spellCheck="false" spellCheck="false"
className="maputnik-number" className="maputnik-number"
placeholder={this.props.default} placeholder={this.props.default}
value={this.state.dirtyValue} value={this.state.dirtyValue === undefined ? "" : this.state.dirtyValue}
onChange={e => { onChange={e => {
this.changeValue(e.target.value) this.changeValue(e.target.value)
}} }}