From c1c1aff37938a726fd57fc6196067229ad3e38db Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Tue, 20 Dec 2016 09:01:39 -0500 Subject: [PATCH] make inter-component root and yield options _private --- src/generators/dom/index.js | 8 ++++---- src/generators/dom/visitors/Component.js | 4 ++-- src/generators/dom/visitors/YieldTag.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js index a6b4904491..c884ef3b0d 100644 --- a/src/generators/dom/index.js +++ b/src/generators/dom/index.js @@ -268,8 +268,8 @@ export default function dom ( parsed, source, options, names ) { if ( templateProperties.onrender ) { builders.init.addBlock( deindent` - if ( options.root ) { - options.root.__renderHooks.push({ fn: template.onrender, context: this }); + if ( options._root ) { + options._root.__renderHooks.push({ fn: template.onrender, context: this }); } else { template.onrender.call( this ); } @@ -298,8 +298,8 @@ export default function dom ( parsed, source, options, names ) { this.set = set; this.teardown = teardown; - this.root = options.root; - this.yield = options.yield; + this._root = options._root; + this._yield = options._yield; ${builders.init} } diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js index 7a3b7c98a8..50bcc98466 100644 --- a/src/generators/dom/visitors/Component.js +++ b/src/generators/dom/visitors/Component.js @@ -26,7 +26,7 @@ export default { const componentInitProperties = [ `target: ${!isToplevel ? generator.current.target: 'null'}`, - 'root: component.root || component' + '_root: component._root || component' ]; // Component has children, put them in a separate {{yield}} block @@ -43,7 +43,7 @@ export default { `${name}_yieldFragment.update( changed, root );` ); - componentInitProperties.push(`yield: ${name}_yieldFragment`); + componentInitProperties.push( `_yield: ${name}_yieldFragment`); } const statements = []; diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js index a2ac7f57d7..5fefcd73a3 100644 --- a/src/generators/dom/visitors/YieldTag.js +++ b/src/generators/dom/visitors/YieldTag.js @@ -4,11 +4,11 @@ export default { generator.createAnchor( anchor, 'yield' ); generator.current.builders.mount.addLine( - `component.yield && component.yield.mount( ${generator.current.target}, ${anchor} );` + `component._yield && component._yield.mount( ${generator.current.target}, ${anchor} );` ); generator.current.builders.teardown.addLine( - `component.yield && component.yield.teardown( detach );` + `component._yield && component._yield.teardown( detach );` ); } };