Skip to content

Commit

Permalink
New build following PR to resolve Github issue #23. Credited Abimbola…
Browse files Browse the repository at this point in the history
… Idowu for the improvement.
  • Loading branch information
martindrapeau committed Oct 8, 2017
1 parent d2257d3 commit d8114c1
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
4 changes: 4 additions & 0 deletions application/views/home_view.php
Expand Up @@ -40,6 +40,10 @@
<div class="row">
<div class="col-md-6">
<h3>Change Log</h3>
<h4>2017-10-07</h4>
<p>
<a href="https://github.com/hisabimbola" target="_blank">Abimbola Idowu</a> added single quote option. <a href="https://github.com/martindrapeau/csvjson-app/issues/23" target="_blank">GitHub issue #23</a>
</p>
<h4>2017-09-04</h4>
<p>
SQL to JSON parsing bug fix: <a href="https://github.com/martindrapeau/csvjson-app/issues/22" target="_blank">GitHub Issue #22</a>.
Expand Down
5 changes: 3 additions & 2 deletions application/views/json_beautifier_view.php
Expand Up @@ -109,8 +109,9 @@
</ul>
<h4>Change Log</h4>
<ul>
<li><strong>Sep 27, 2016</strong> Bug fix: Inline short arrays bug fix and improvement. Added nesting depth option. <a href="https://github.com/martindrapeau/csvjson-app/issues/12">GitHub issue #12</a></li>
<li><strong>Aug 22, 2016</strong> Bug fix: Inline short arrays was not working properly. <a href="https://github.com/martindrapeau/csvjson-app/issues/9">GitHub issue #9</a></li>
<li><strong>Oct 7, 2017</strong> Improvement: <a href="https://github.com/hisabimbola" target="_blank">Abimbola Idowu</a> added single quote option. <a href="https://github.com/martindrapeau/csvjson-app/issues/23" target="_blank">GitHub issue #23</a></li>
<li><strong>Sep 27, 2016</strong> Bug fix: Inline short arrays bug fix and improvement. Added nesting depth option. <a href="https://github.com/martindrapeau/csvjson-app/issues/12" target="_blank">GitHub issue #12</a></li>
<li><strong>Aug 22, 2016</strong> Bug fix: Inline short arrays was not working properly. <a href="https://github.com/martindrapeau/csvjson-app/issues/9" target="_blank">GitHub issue #9</a></li>
<li><strong>Dec 30, 2015</strong> Bug fix: drop quotes on keys of nested objects.</li>
<li><strong>Jun 1, 2015</strong> Bug fix: proper support of commas inside quotes.</li>
<li><strong>Jan 12, 2014</strong> Initial release.</li>
Expand Down
4 changes: 2 additions & 2 deletions js/app.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions js/csvjson.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions js/csvjson/json_beautifier.js
Expand Up @@ -71,11 +71,11 @@
if (json.length == 0) throw errorEmpty;

var space = options.space || 2,
dropQuotesOnKeys = options.dropQuotesOnKeys || false,
dropQuotesOnNumbers = options.dropQuotesOnNumbers || false,
inlineShortArrays = options.inlineShortArrays || false,
inlineShortArraysDepth = options.inlineShortArraysDepth || 1,
quoteType = options.quoteType || 'double'
dropQuotesOnKeys = options.dropQuotesOnKeys || false,
dropQuotesOnNumbers = options.dropQuotesOnNumbers || false,
inlineShortArrays = options.inlineShortArrays || false,
inlineShortArraysDepth = options.inlineShortArraysDepth || 1,
quoteType = options.quoteType || 'double';

var object = jsonlint.parse(json);
if (dropQuotesOnNumbers) walkObjectAndDropQuotesOnNumbers(object);
Expand Down
2 changes: 1 addition & 1 deletion js/src/version
@@ -1 +1 @@
0.161
0.162

0 comments on commit d8114c1

Please sign in to comment.