diff options
Diffstat (limited to 'share/www/script/futon.format.js')
| -rw-r--r-- | share/www/script/futon.format.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/share/www/script/futon.format.js b/share/www/script/futon.format.js index 601a91d3..5feee817 100644 --- a/share/www/script/futon.format.js +++ b/share/www/script/futon.format.js @@ -42,7 +42,7 @@ case "string": var retval = val; if (type == "string" && !options.escapeStrings) { - retval = indentLines(retval, tab); + retval = indentLines(retval.replace(/\r\n/g, "\n"), tab.substr(options.indent)); } else { retval = escape(JSON.stringify(val)); } @@ -70,7 +70,9 @@ buf.push(index > 0 ? itemsep : options.linesep); buf.push(tab, format(val[index], depth + 1)); } - if (index >= 0) buf.push(options.linesep, tab.substr(options.indent)); + if (index >= 0) { + buf.push(options.linesep, tab.substr(options.indent)); + } buf.push("]"); if (options.html) { return "<code class='array'>" + buf.join("") + "</code>"; @@ -95,7 +97,9 @@ ": ", format(val[key], depth + 1)); index++; } - if (index >= 0) buf.push(options.linesep, tab.substr(options.indent)); + if (index >= 0) { + buf.push(options.linesep, tab.substr(options.indent)); + } buf.push("}"); if (options.html) { return "<code class='object'>" + buf.join("") + "</code>"; |