tidy formatting

pull/5179/head
Conduitry 5 years ago
parent 76e23b2c60
commit 57aeb3e25c

@ -301,18 +301,15 @@ export default class EachBlockWrapper extends Wrapper {
const has_transitions = !!(this.else.block.has_intro_method || this.else.block.has_outro_method); const has_transitions = !!(this.else.block.has_intro_method || this.else.block.has_outro_method);
const destroy_block_else = this.else.block.has_outro_method const destroy_block_else = this.else.block.has_outro_method
? ? b`
b` @group_outros();
@group_outros(); @transition_out(${each_block_else}, 1, 1, () => {
@transition_out(${each_block_else}, 1, 1, () => {
${each_block_else} = null;
});
@check_outros();
`
: b`
${each_block_else}.d(1);
${each_block_else} = null; ${each_block_else} = null;
`; });
@check_outros();`
: b`
${each_block_else}.d(1);
${each_block_else} = null;`;
if (this.else.block.has_update_method) { if (this.else.block.has_update_method) {
this.updates.push(b` this.updates.push(b`
@ -328,7 +325,6 @@ export default class EachBlockWrapper extends Wrapper {
} }
`); `);
} else { } else {
this.updates.push(b` this.updates.push(b`
if (${this.vars.data_length}) { if (${this.vars.data_length}) {
if (${each_block_else}) { if (${each_block_else}) {
@ -336,8 +332,8 @@ export default class EachBlockWrapper extends Wrapper {
} }
} else if (!${each_block_else}) { } else if (!${each_block_else}) {
${each_block_else} = ${this.else.block.name}(#ctx); ${each_block_else} = ${this.else.block.name}(#ctx);
${each_block_else}.c(); ${each_block_else}.c();
${has_transitions && b`@transition_in(${each_block_else}, 1);`} ${has_transitions && b`@transition_in(${each_block_else}, 1);`}
${each_block_else}.m(${update_mount_node}, ${update_anchor_node}); ${each_block_else}.m(${update_mount_node}, ${update_anchor_node});
} }
`); `);

@ -1,54 +1,54 @@
export default { export default {
props: { props: {
things: ['a', 'b', 'c'] things: ['a', 'b', 'c']
}, },
test({ assert, component, target, window, raf }) { test({ assert, component, target, window, raf }) {
component.things = []; component.things = [];
let div = target.querySelector('div'); let div = target.querySelector('div');
assert.equal(div.foo, 0); assert.equal(div.foo, 0);
raf.tick(200); raf.tick(200);
assert.equal(div.foo, 0.5); assert.equal(div.foo, 0.5);
raf.tick(300); raf.tick(300);
assert.equal(div.foo, 0.75); assert.equal(div.foo, 0.75);
raf.tick(400); raf.tick(400);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
raf.tick(600); raf.tick(600);
component.things = ['a', 'b', 'c']; component.things = ['a', 'b', 'c'];
raf.tick(700); raf.tick(700);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
assert.equal(div.bar, 0.75); assert.equal(div.bar, 0.75);
raf.tick(800); raf.tick(800);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
assert.equal(div.bar, 0.5); assert.equal(div.bar, 0.5);
raf.tick(900); raf.tick(900);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
assert.equal(div.bar, 0.25); assert.equal(div.bar, 0.25);
// test outro before intro complete // test outro before intro complete
raf.tick(1000); raf.tick(1000);
component.things = []; component.things = [];
div = target.querySelector('div'); div = target.querySelector('div');
raf.tick(1200); raf.tick(1200);
assert.equal(div.foo, 0.5); assert.equal(div.foo, 0.5);
component.things = ['a', 'b', 'c']; component.things = ['a', 'b', 'c'];
raf.tick(1300); raf.tick(1300);
assert.equal(div.foo, 0.75); assert.equal(div.foo, 0.75);
assert.equal(div.bar, 0.75); assert.equal(div.bar, 0.75);
raf.tick(1400); raf.tick(1400);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
assert.equal(div.bar, 0.5); assert.equal(div.bar, 0.5);
raf.tick(2000); raf.tick(2000);
} }
}; };

@ -10,18 +10,18 @@
}; };
} }
function bar(node, params) { function bar(node, params) {
return { return {
duration: 400, duration: 400,
tick: t => { tick: t => {
node.bar = t; node.bar = t;
} }
}; };
} }
</script> </script>
{#each things as thing} {#each things as thing}
<p>{thing}</p> <p>{thing}</p>
{:else} {:else}
<div in:foo out:bar>else</div> <div in:foo out:bar>else</div>
{/each} {/each}

@ -1,22 +1,22 @@
export default { export default {
props: { props: {
things: ['a', 'b', 'c'] things: ['a', 'b', 'c']
}, },
test({ assert, component, target, window, raf }) { test({ assert, component, target, window, raf }) {
component.things = []; component.things = [];
const div = target.querySelector('div'); const div = target.querySelector('div');
assert.equal(div.foo, 0); assert.equal(div.foo, 0);
raf.tick(200); raf.tick(200);
assert.equal(div.foo, 0.5); assert.equal(div.foo, 0.5);
raf.tick(300); raf.tick(300);
assert.equal(div.foo, 0.75); assert.equal(div.foo, 0.75);
raf.tick(400); raf.tick(400);
assert.equal(div.foo, 1); assert.equal(div.foo, 1);
raf.tick(500); raf.tick(500);
} }
}; };

@ -12,7 +12,7 @@
</script> </script>
{#each things as thing} {#each things as thing}
<p>{thing}</p> <p>{thing}</p>
{:else} {:else}
<div in:foo>else</div> <div in:foo>else</div>
{/each} {/each}

@ -1,20 +1,20 @@
export default { export default {
props: { props: {
things: [] things: []
}, },
test({ assert, component, target, window, raf }) { test({ assert, component, target, window, raf }) {
const div = target.querySelector('div'); const div = target.querySelector('div');
component.things = ['a', 'b', 'c']; component.things = ['a', 'b', 'c'];
raf.tick(200); raf.tick(200);
assert.equal(div.foo, 0.5); assert.equal(div.foo, 0.5);
raf.tick(300); raf.tick(300);
assert.equal(div.foo, 0.25); assert.equal(div.foo, 0.25);
raf.tick(400); raf.tick(400);
assert.equal(div.foo, 0); assert.equal(div.foo, 0);
raf.tick(500); raf.tick(500);
} }
}; };

@ -12,7 +12,7 @@
</script> </script>
{#each things as thing} {#each things as thing}
<p>{thing}</p> <p>{thing}</p>
{:else} {:else}
<div out:foo>else</div> <div out:foo>else</div>
{/each} {/each}
Loading…
Cancel
Save