react-json-pretty
Advanced tools
Comparing version 1.2.1 to 1.2.2
@@ -8,3 +8,3 @@ var React = require('react'); | ||
bbbb: true, | ||
cccc: "abcd", | ||
cccc: "ab\"cd\\", | ||
dddd: { | ||
@@ -11,0 +11,0 @@ eeee: 1, |
@@ -24,4 +24,5 @@ { | ||
"stylus-loader": "^1.4.2", | ||
"webpack": "^1.12.9" | ||
"webpack": "^1.12.9", | ||
"react-json-pretty": "~1.2.1" | ||
} | ||
} |
@@ -10,2 +10,3 @@ var React = require('react'); | ||
var strSpan = '<span class=json-string>'; | ||
var booSpan = '<span class=json-boolean>'; | ||
var sps = ind || ''; | ||
@@ -15,5 +16,12 @@ if (key) { | ||
} | ||
if (val) { | ||
sps = sps + (val[0] == '"' ? strSpan : valSpan) + val + spanEnd; | ||
if (val === "true" || val === "false") { | ||
sps = sps + (val[0] == '"' ? strSpan : booSpan) + val + spanEnd; | ||
} | ||
else { | ||
sps = sps + (val[0] == '"' ? strSpan : valSpan) + val + spanEnd; | ||
} | ||
} | ||
return sps + (tra || ''); | ||
@@ -26,3 +34,3 @@ }, | ||
return JSON.stringify(obj, null, 2) | ||
.replace(/&/g, '&').replace(/\\"/g, '"') | ||
.replace(/&/g, '&').replace(/\\"([^,])/g, '"$1') | ||
.replace(/</g, '<').replace(/>/g, '>') | ||
@@ -29,0 +37,0 @@ .replace(regLine, this._replace); |
{ | ||
"name": "react-json-pretty", | ||
"version": "1.2.1", | ||
"version": "1.2.2", | ||
"description": "A code formatting tool for raw json data", | ||
@@ -5,0 +5,0 @@ "main": "src/JSONPretty.js", |
@@ -18,2 +18,3 @@ 'use strict'; | ||
var strSpan = '<span class=json-string>'; | ||
var booSpan = '<span class=json-boolean>'; | ||
var sps = ind || ''; | ||
@@ -23,5 +24,11 @@ if (key) { | ||
} | ||
if (val) { | ||
sps = sps + (val[0] == '"' ? strSpan : valSpan) + val + spanEnd; | ||
if (val === "true" || val === "false") { | ||
sps = sps + (val[0] == '"' ? strSpan : booSpan) + val + spanEnd; | ||
} else { | ||
sps = sps + (val[0] == '"' ? strSpan : valSpan) + val + spanEnd; | ||
} | ||
} | ||
return sps + (tra || ''); | ||
@@ -33,3 +40,3 @@ }, | ||
var regLine = /^( *)("[^"]+": )?("[^"]*"|[\w.+-]*)?([,[{]|\[\s*\],?|\{\s*\},?)?$/mg; | ||
return JSON.stringify(obj, null, 2).replace(/&/g, '&').replace(/\\"/g, '"').replace(/</g, '<').replace(/>/g, '>').replace(regLine, this._replace); | ||
return JSON.stringify(obj, null, 2).replace(/&/g, '&').replace(/\\"([^,])/g, '"$1').replace(/</g, '<').replace(/>/g, '>').replace(regLine, this._replace); | ||
}, | ||
@@ -39,7 +46,6 @@ render: function render() { | ||
// See https://facebook.github.io/react/warnings/unknown-prop.html | ||
var _props = this.props; | ||
var json = _props.json; | ||
var _props = this.props, | ||
json = _props.json, | ||
rest = _objectWithoutProperties(_props, ['json']); | ||
var rest = _objectWithoutProperties(_props, ['json']); | ||
if (typeof json === 'string') { | ||
@@ -46,0 +52,0 @@ try { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
2120779
52462