Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

Commit

Permalink
Merge pull request #25 from bvaughn/issues/19
Browse files Browse the repository at this point in the history
Fixed regression in displayed values that caused all values to be displayed as strings
  • Loading branch information
chibicode committed Jan 12, 2016
2 parents 651e85d + 5ff22d7 commit 4b189e1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/JSONValueNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ export default class JSONValueNode extends React.Component {
{this.props.labelRenderer(this.props.keyName)}:
</label>
<span style={{
color: this.props.theme.base0B,
...this.props.styles.getValueStyle('String', true)
}}>"{this.props.valueRenderer(this.props.valueGetter(this.props.value))}"</span>
color: this.props.valueColor,
...this.props.styles.getValueStyle(this.props.nodeType, true)
}}>{this.props.valueRenderer(this.props.valueGetter(this.props.value))}</span>
</li>
);
}
Expand Down
14 changes: 7 additions & 7 deletions src/grab-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ export default function({
case 'Iterable':
return <JSONIterableNode {...nestedNodeProps} />;
case 'String':
return <JSONValueNode {...simpleNodeProps} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => `"${raw}"`} />;
case 'Number':
return <JSONValueNode {...simpleNodeProps} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} />;
case 'Boolean':
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw ? 'true' : 'false'} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} valueGetter={raw => raw ? 'true' : 'false'} />;
case 'Date':
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toISOString()} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => raw.toISOString()} />;
case 'Null':
return <JSONValueNode {...simpleNodeProps} valueGetter={() => null} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'null'} />;
case 'Undefined':
return <JSONValueNode {...simpleNodeProps} valueGetter={() => undefined} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'undefined'} />;
case 'Function':
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toString()} />;
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={raw => raw.toString()} />;
default:
return false;
}
Expand Down

0 comments on commit 4b189e1

Please sign in to comment.