From a4d5e95bb1439275ae898d83d61dab515c412e71 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Mon, 9 Mar 2015 13:36:23 -0700
Subject: [PATCH 1/4] Revert "Make event handlers get called with target's
 view"

This reverts commit 72887bb0ee95d3358846814f80117ec16b0c0eb9.
---
 packages/blaze/view.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/blaze/view.js b/packages/blaze/view.js
index b8d429052f..05a1389d63 100644
--- a/packages/blaze/view.js
+++ b/packages/blaze/view.js
@@ -817,10 +817,9 @@ Blaze._addEventMap = function (view, eventMap, thisInHandler) {
               return null;
             var handlerThis = thisInHandler || this;
             var handlerArgs = arguments;
-            return Blaze._withCurrentView(Blaze.getView(evt.currentTarget),
-              function () {
-                return handler.apply(handlerThis, handlerArgs);
-              });
+            return Blaze._withCurrentView(view, function () {
+              return handler.apply(handlerThis, handlerArgs);
+            });
           },
           range, function (r) {
             return r.parentRange;

From 4dafb236affa5e571668a4b6cda558959cf1186d Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Mon, 9 Mar 2015 13:37:45 -0700
Subject: [PATCH 2/4] Change documentation for Template.currentData in events

---
 packages/blaze/template.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/blaze/template.js b/packages/blaze/template.js
index fddef8f4ed..a12f9e15ca 100644
--- a/packages/blaze/template.js
+++ b/packages/blaze/template.js
@@ -490,10 +490,10 @@ Template.instance = function () {
  *
  * - Inside an `onCreated`, `onRendered`, or `onDestroyed` callback, returns
  * the data context of the template.
+ * - Inside an event handler, returns the data context of the template on which
+ * this event handler was defined.
  * - Inside a helper, returns the data context of the DOM node where the helper
  * was used.
- * - Inside an event handler, returns the data context of the element that fired
- * the event.
  *
  * Establishes a reactive dependency on the result.
  * @locus Client

From a6d4e984078fa9198a3c6d9fc0dc67792aa61ade Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Mon, 9 Mar 2015 13:39:44 -0700
Subject: [PATCH 3/4] Revert "Tests for `Template.currentData` and
 `Template.parentData`"

This reverts commit f2840103ca23dedd458524ad4e01609069ce28cb.

Conflicts:
	packages/spacebars-tests/template_tests.html
	packages/spacebars-tests/template_tests.js
---
 packages/spacebars-tests/template_tests.html |  8 ---
 packages/spacebars-tests/template_tests.js   | 52 --------------------
 2 files changed, 60 deletions(-)

diff --git a/packages/spacebars-tests/template_tests.html b/packages/spacebars-tests/template_tests.html
index fd1d469eb4..6ff3a5582a 100644
--- a/packages/spacebars-tests/template_tests.html
+++ b/packages/spacebars-tests/template_tests.html
@@ -1028,14 +1028,6 @@ Hi there!
   {{> Template.contentBlock}}
 </template>
 
-<template name="spacebars_template_test_currentData_and_parentData_in_events">
-  {{#with x=1}}
-    {{#with y=2}}
-      <button>{{label}}</button>
-    {{/with}}
-  {{/with}}
-</template>
-
 <template name="spacebars_template_test_template_level_subscriptions">
   {{#if Template.subscriptionsReady}}
     ready!
diff --git a/packages/spacebars-tests/template_tests.js b/packages/spacebars-tests/template_tests.js
index 8adf4505e7..ca31510254 100644
--- a/packages/spacebars-tests/template_tests.js
+++ b/packages/spacebars-tests/template_tests.js
@@ -10,20 +10,7 @@ var nodesToArray = function (array) {
   return _.map(array, _.identity);
 };
 
-var inDocument = function (elem) {
-  while ((elem = elem.parentNode)) {
-    if (elem == document) {
-      return true;
-    }
-  }
-  return false;
-};
-
-
 var clickIt = function (elem) {
-  if (!inDocument(elem))
-    throw new Error("Can't click on elements without first adding them to the document");
-
   // jQuery's bubbling change event polyfill for IE 8 seems
   // to require that the element in question have focus when
   // it receives a simulated click.
@@ -3098,45 +3085,6 @@ Tinytest.add("spacebars-tests - template_tests - custom block helper doesn't bre
   test.equal(canonicalizeHtml(div.innerHTML), "hello hello");
 });
 
-Tinytest.add(
-  "spacebars-tests - template_tests - currentData and parentData in event handlers and helpers",
-  function (test) {
-    var tmpl = Template.spacebars_template_test_currentData_and_parentData_in_events;
-
-    var clicked = false;
-    var currentInEvent;
-    var parentInEvent;
-    var currentInHelper;
-    var parentInHelper;
-
-    tmpl.events({
-      'click button': function () {
-        currentInEvent = Template.currentData();
-        parentInEvent = Template.parentData(1);
-      }
-    });
-
-    tmpl.helpers({
-      label: function () {
-        currentInHelper = Template.currentData();
-        parentInHelper = Template.parentData(1);
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    var button = div.querySelector('button');
-    document.body.appendChild(div);
-
-    clickIt(button);
-
-    test.equal(currentInEvent, {y: 2});
-    test.equal(parentInEvent, {x: 1});
-    test.equal(currentInHelper, {y: 2});
-    test.equal(parentInHelper, {x: 1});
-
-    document.body.removeChild(div);
-  });
-
 testAsyncMulti("spacebars-tests - template_tests - template-level subscriptions", [
   function (test, expect) {
     var tmpl = Template.spacebars_template_test_template_level_subscriptions;

From 395f65859b19f8cbefa8b763c93a3b4eca384287 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Mon, 9 Mar 2015 13:40:26 -0700
Subject: [PATCH 4/4] Re-add helpful changes from
 f2840103ca23dedd458524ad4e01609069ce28cb

---
 packages/spacebars-tests/template_tests.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/spacebars-tests/template_tests.js b/packages/spacebars-tests/template_tests.js
index ca31510254..b68a491bc0 100644
--- a/packages/spacebars-tests/template_tests.js
+++ b/packages/spacebars-tests/template_tests.js
@@ -10,7 +10,19 @@ var nodesToArray = function (array) {
   return _.map(array, _.identity);
 };
 
+var inDocument = function (elem) {
+  while ((elem = elem.parentNode)) {
+    if (elem == document) {
+      return true;
+    }
+  }
+  return false;
+};
+
 var clickIt = function (elem) {
+  if (!inDocument(elem))
+    throw new Error("Can't click on elements without first adding them to the document");
+
   // jQuery's bubbling change event polyfill for IE 8 seems
   // to require that the element in question have focus when
   // it receives a simulated click.