fix some stuff

pull/1971/head
Richard Harris 7 years ago
parent d46248030c
commit 7412307221

@ -363,7 +363,6 @@ export default class Block {
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
${dev ? 'o: function outro' : 'o'}() { ${dev ? 'o: function outro' : 'o'}() {
if (#current === false) return;
${this.builders.outro} ${this.builders.outro}
}, },
`); `);

@ -604,7 +604,7 @@ export default class ElementWrapper extends Wrapper {
${name}.run(0); ${name}.run(0);
`); `);
block.builders.destroy.addConditional('detach', `if (${name}) console.log('detaching'), ${name}.end();`); block.builders.destroy.addConditional('detach', `if (${name}) ${name}.end();`);
} }
else { else {

@ -431,7 +431,6 @@ export default class IfBlockWrapper extends Wrapper {
? deindent` ? deindent`
@group_outros(); @group_outros();
@on_outro(() => { @on_outro(() => {
console.log('outros completed');
${name}.d(1); ${name}.d(1);
${name} = null; ${name} = null;
}); });

@ -18,7 +18,6 @@ function wait() {
let outros; let outros;
export function group_outros() { export function group_outros() {
console.log('grouping');
outros = { outros = {
remaining: 0, remaining: 0,
callbacks: [] callbacks: []
@ -26,15 +25,12 @@ export function group_outros() {
} }
export function check_outros() { export function check_outros() {
console.trace(`${outros.remaining} outros remaining`);
if (!outros.remaining) { if (!outros.remaining) {
console.log(outros.callbacks.map(c => c.toString()))
run_all(outros.callbacks); run_all(outros.callbacks);
} }
} }
export function on_outro(callback) { export function on_outro(callback) {
console.log('adding', callback.toString());
outros.callbacks.push(callback); outros.callbacks.push(callback);
} }
@ -251,7 +247,6 @@ export function create_bidirectional_transition(node, fn, params, intro) {
node.dispatchEvent(new window.CustomEvent(`${running_program.b ? 'intro' : 'outro'}start`)); node.dispatchEvent(new window.CustomEvent(`${running_program.b ? 'intro' : 'outro'}start`));
loop(now => { loop(now => {
console.log({ now, pending_program, running_program });
if (pending_program && now > pending_program.start) { if (pending_program && now > pending_program.start) {
running_program = init(pending_program, duration); running_program = init(pending_program, duration);
pending_program = null; pending_program = null;
@ -282,7 +277,6 @@ export function create_bidirectional_transition(node, fn, params, intro) {
} }
} }
console.log('running program ended');
running_program = null; running_program = null;
} }
@ -300,7 +294,6 @@ export function create_bidirectional_transition(node, fn, params, intro) {
return { return {
run(b) { run(b) {
console.log(`run`, b);
if (typeof config === 'function') { if (typeof config === 'function') {
wait().then(() => { wait().then(() => {
config = config(); config = config();
@ -312,7 +305,6 @@ export function create_bidirectional_transition(node, fn, params, intro) {
}, },
end() { end() {
console.log('end');
clear_animation(); clear_animation();
running_program = pending_program = null; running_program = pending_program = null;
} }

@ -16,15 +16,11 @@ export default {
assert.equal(div.foo, 0.75); assert.equal(div.foo, 0.75);
assert.htmlEqual(div.innerHTML, 'hello everybody!'); assert.htmlEqual(div.innerHTML, 'hello everybody!');
console.group('set visible false');
component.visible = false; component.visible = false;
console.groupEnd();
component.name = 'again'; component.name = 'again';
assert.htmlEqual(div.innerHTML, 'hello everybody!'); assert.htmlEqual(div.innerHTML, 'hello everybody!');
console.group('tick 125');
raf.tick(125); raf.tick(125);
console.groupEnd();
assert.equal(div.foo, 0.25); assert.equal(div.foo, 0.25);
component.visible = true; component.visible = true;

Loading…
Cancel
Save