Skip to content

Commit d703dca

Browse files
committed
merge master
2 parents dc78491 + 3989048 commit d703dca

32 files changed

+1276
-1564
lines changed

documentation/docs/02-template-syntax/02-basic-markup.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ By default, attributes work exactly like their HTML counterparts.
2828

2929
As in HTML, values may be unquoted.
3030

31+
<!-- prettier-ignore -->
3132
```svelte
32-
<input type="checkbox" />
33+
<input type=checkbox />
3334
```
3435

3536
Attribute values can contain JavaScript expressions.

documentation/examples/12-svg/05-svg-transitions/App.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<div class="centered" out:fly={{ y: -20, duration: 800 }}>
2323
{#each 'SVELTE' as char, i}
24-
<span in:fade={{ delay: 1000 + i * 150, duration: 800 }}>{char}</span>
24+
<span in:fade|global={{ delay: 1000 + i * 150, duration: 800 }}>{char}</span>
2525
{/each}
2626
</div>
2727
{/if}

packages/svelte/src/compiler/Stats.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ const now = () => performance.now();
33
/** @param {any} timings */
44
function collapse_timings(timings) {
55
const result = {};
6-
timings.forEach(
7-
/** @param {any} timing */ (timing) => {
8-
result[timing.label] = Object.assign(
9-
{
10-
total: timing.end - timing.start
11-
},
12-
timing.children && collapse_timings(timing.children)
13-
);
14-
}
15-
);
6+
timings.forEach((timing) => {
7+
result[timing.label] = Object.assign(
8+
{
9+
total: timing.end - timing.start
10+
},
11+
timing.children && collapse_timings(timing.children)
12+
);
13+
});
1614
return result;
1715
}
1816

0 commit comments

Comments
 (0)