From d9590bd65a5694d7ee6c3c66bccec3bb51b4b0c1 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 11 Apr 2017 11:02:20 -0400 Subject: [PATCH] fix all aliasing tests --- src/generators/dom/visitors/Component/Component.js | 2 +- src/generators/dom/visitors/Element/EventHandler.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/generators/dom/visitors/Component/Component.js b/src/generators/dom/visitors/Component/Component.js index 5446d54276..5e210e9762 100644 --- a/src/generators/dom/visitors/Component/Component.js +++ b/src/generators/dom/visitors/Component/Component.js @@ -140,7 +140,7 @@ export default function visitComponent ( generator, block, state, node ) { if ( local.bindings.length ) { const initialData = block.getUniqueName( `${name}_initial_data` ); - statements.push( `var ${name}_initial_data = ${initialPropString};` ); + statements.push( `var ${initialData} = ${initialPropString};` ); local.bindings.forEach( binding => { statements.push( `if ( ${binding.prop} in ${binding.obj} ) ${initialData}.${binding.name} = ${binding.value};` ); diff --git a/src/generators/dom/visitors/Element/EventHandler.js b/src/generators/dom/visitors/Element/EventHandler.js index 63b8f0b43d..189bb536c4 100644 --- a/src/generators/dom/visitors/Element/EventHandler.js +++ b/src/generators/dom/visitors/Element/EventHandler.js @@ -37,8 +37,9 @@ export default function visitEventHandler ( generator, block, state, node, attri const listName = block.listNames.get( name ); const indexName = block.indexNames.get( name ); + const contextName = block.contexts.get( name ); - return `var ${listName} = ${_this}._svelte.${listName}, ${indexName} = ${_this}._svelte.${indexName}, ${name} = ${listName}[${indexName}];`; + return `var ${listName} = ${_this}._svelte.${listName}, ${indexName} = ${_this}._svelte.${indexName}, ${contextName} = ${listName}[${indexName}];`; }); // get a name for the event handler that is globally unique