From c61ce134df61b6ad6afb322039d46d0a0086d76e Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 11 Apr 2017 09:25:56 -0400
Subject: [PATCH 1/2] move some tests to where they belong

---
 test/{generator => runtime}/samples/computed-empty/_config.js   | 0
 test/{generator => runtime}/samples/computed-empty/main.html    | 0
 test/{generator => runtime}/samples/observe-deferred/_config.js | 0
 test/{generator => runtime}/samples/observe-deferred/main.html  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{generator => runtime}/samples/computed-empty/_config.js (100%)
 rename test/{generator => runtime}/samples/computed-empty/main.html (100%)
 rename test/{generator => runtime}/samples/observe-deferred/_config.js (100%)
 rename test/{generator => runtime}/samples/observe-deferred/main.html (100%)

diff --git a/test/generator/samples/computed-empty/_config.js b/test/runtime/samples/computed-empty/_config.js
similarity index 100%
rename from test/generator/samples/computed-empty/_config.js
rename to test/runtime/samples/computed-empty/_config.js
diff --git a/test/generator/samples/computed-empty/main.html b/test/runtime/samples/computed-empty/main.html
similarity index 100%
rename from test/generator/samples/computed-empty/main.html
rename to test/runtime/samples/computed-empty/main.html
diff --git a/test/generator/samples/observe-deferred/_config.js b/test/runtime/samples/observe-deferred/_config.js
similarity index 100%
rename from test/generator/samples/observe-deferred/_config.js
rename to test/runtime/samples/observe-deferred/_config.js
diff --git a/test/generator/samples/observe-deferred/main.html b/test/runtime/samples/observe-deferred/main.html
similarity index 100%
rename from test/generator/samples/observe-deferred/main.html
rename to test/runtime/samples/observe-deferred/main.html

From 352bb3d354a1c6e5d1209bc527d23e483e211443 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 11 Apr 2017 09:38:34 -0400
Subject: [PATCH 2/2] =?UTF-8?q?ensure=20hoisted=20event=20handler=20names?=
 =?UTF-8?q?=20are=20globally=20unique=20=E2=80=94=20fixes=20#466?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dom/visitors/Element/EventHandler.js      |  2 +-
 .../_config.js                                | 36 +++++++++++++++++++
 .../event-handler-each-deconflicted/main.html |  9 +++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/event-handler-each-deconflicted/_config.js
 create mode 100644 test/runtime/samples/event-handler-each-deconflicted/main.html

diff --git a/src/generators/dom/visitors/Element/EventHandler.js b/src/generators/dom/visitors/Element/EventHandler.js
index 2a51cdc1fff0..1099238b83cd 100644
--- a/src/generators/dom/visitors/Element/EventHandler.js
+++ b/src/generators/dom/visitors/Element/EventHandler.js
@@ -44,7 +44,7 @@ export default function visitEventHandler ( generator, block, state, node, attri
 	// get a name for the event handler that is globally unique
 	// if hoisted, locally unique otherwise
 	const handlerName = shouldHoist ?
-		generator.alias( `${name}_handler` ) :
+		generator.getUniqueName( `${name}_handler` ) :
 		block.getUniqueName( `${name}_handler` );
 
 	// create the handler body
diff --git a/test/runtime/samples/event-handler-each-deconflicted/_config.js b/test/runtime/samples/event-handler-each-deconflicted/_config.js
new file mode 100644
index 000000000000..0c11a15d3df4
--- /dev/null
+++ b/test/runtime/samples/event-handler-each-deconflicted/_config.js
@@ -0,0 +1,36 @@
+export default {
+	data: {
+		foo: [ 1 ],
+		bar: [ 2 ],
+		clicked: 'neither'
+	},
+
+	html: `
+		<button>foo</button>
+		<button>bar</button>
+		<p>clicked: neither</p>
+	`,
+
+	test ( assert, component, target, window ) {
+		const buttons = target.querySelectorAll( 'button' );
+		const event = new window.MouseEvent( 'click' );
+
+		buttons[0].dispatchEvent( event );
+		assert.equal( component.get( 'clicked' ), 'foo' );
+		assert.htmlEqual( target.innerHTML, `
+			<button>foo</button>
+			<button>bar</button>
+			<p>clicked: foo</p>
+		` );
+
+		buttons[1].dispatchEvent( event );
+		assert.equal( component.get( 'clicked' ), 'bar' );
+		assert.htmlEqual( target.innerHTML, `
+			<button>foo</button>
+			<button>bar</button>
+			<p>clicked: bar</p>
+		` );
+
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/event-handler-each-deconflicted/main.html b/test/runtime/samples/event-handler-each-deconflicted/main.html
new file mode 100644
index 000000000000..4dcc770e83ec
--- /dev/null
+++ b/test/runtime/samples/event-handler-each-deconflicted/main.html
@@ -0,0 +1,9 @@
+{{#each foo as f}}
+	<button on:click='set({ clicked: "foo" })'>foo</button>
+{{/each}}
+
+{{#each bar as b}}
+	<button on:click='set({ clicked: "bar" })'>bar</button>
+{{/each}}
+
+<p>clicked: {{clicked}}</p>
\ No newline at end of file