From f7d499446714a7c503c753538181c306b6e2c0d7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 9 Dec 2017 18:48:22 -0500 Subject: [PATCH] tidy up --- src/generators/Generator.ts | 2 -- src/generators/dom/Block.ts | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index abb9a02c61..2285c1185b 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -13,8 +13,6 @@ import wrapModule from './wrapModule'; import annotateWithScopes, { Scope } from '../utils/annotateWithScopes'; import getName from '../utils/getName'; import clone from '../utils/clone'; -import DomBlock from './dom/Block'; -import SsrBlock from './server-side-rendering/Block'; import Stylesheet from '../css/Stylesheet'; import { test } from '../config'; import nodes from './nodes/index'; diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index be47076174..4d4413d8c8 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -134,9 +134,10 @@ export default class Block { this.builders.create.addLine(`${name} = ${renderStatement};`); this.builders.claim.addLine(`${name} = ${claimStatement};`); - this.mount(name, parentNode); - - if (!parentNode) { + if (parentNode) { + this.builders.mount.addLine(`@appendNode(${name}, ${parentNode});`); + } else { + this.builders.mount.addLine(`@insertNode(${name}, #target, anchor);`); this.builders.unmount.addLine(`@detachNode(${name});`); } } @@ -167,14 +168,6 @@ export default class Block { return this.generator.contextualise(this.contexts, this.indexes, expression, context, isEventHandler); } - mount(name: string, parentNode: string) { - if (parentNode) { - this.builders.mount.addLine(`@appendNode(${name}, ${parentNode});`); - } else { - this.builders.mount.addLine(`@insertNode(${name}, #target, anchor);`); - } - } - toString() { let introing; const hasIntros = !this.builders.intro.isEmpty();