Skip to content

Commit 94ce316

Browse files
committed
Really remove extra whitespace before all commas
1 parent e30532b commit 94ce316

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/JsonView.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
export let json
33
export let depth = Infinity
44
export let _lvl = 0
5+
export let _last = true
56
67
const collapsedSymbol = '...'
78
const getType = i => {
@@ -69,14 +70,14 @@ ul {
6970
<span class="key">"{i}":</span>
7071
{/if}
7172
{#if getType(json[i]) === 'object'}
72-
<svelte:self json={json[i]} {depth} _lvl={_lvl + 1} />{#if idx < items.length - 1}<span class="comma">,</span>{/if}
73+
<svelte:self json={json[i]} {depth} _lvl={_lvl + 1} _last={idx === items.length - 1} />
7374
{:else}
7475
<span class="val {getType(json[i])}">{format(json[i])}{#if idx < items.length - 1}<span class="comma">,</span>{/if}</span>
7576
{/if}
7677
</li>
7778
{/each}
7879
</ul>
79-
<span class="bracket" on:click={clicked} tabindex="0">{closeBracket}</span>
80+
<span class="bracket" on:click={clicked} tabindex="0">{closeBracket}</span>{#if !_last}<span class="comma">,</span>{/if}
8081
</span>
81-
<span class="bracket" class:hidden={!collapsed} on:click={clicked} tabindex="0">{openBracket}{collapsedSymbol}{closeBracket}</span>
82+
<span class="bracket" class:hidden={!collapsed} on:click={clicked} tabindex="0">{openBracket}{collapsedSymbol}{closeBracket}</span>{#if !_last && collapsed}<span class="comma">,</span>{/if}
8283
{/if}

0 commit comments

Comments
 (0)