Merge pull request #13850 from chadhietala/fix-action-scope

[Glimmer2] Fix action target in a block
emberjs · Jul 20, 2016 · cbe74dd · cbe74dd
2 parents 5757ea5 + f718cdb
commit cbe74dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/ember-glimmer/tests/integration/helpers/element-action-test.js b/packages/ember-glimmer/tests/integration/helpers/element-action-test.js
@@ -1436,7 +1436,7 @@ moduleFor('Helpers test: element action', class extends RenderingTest {
     this.assert.equal(event.isDefaultPrevented(), true, 'should preventDefault');
   }
 
-  ['@htmlbars it should target the proper component when `action` is in yielded block [GH #12409]']() {
+  ['@test it should target the proper component when `action` is in yielded block [GH #12409]']() {
     let outerActionCalled = false;
     let innerClickCalled = false;
 

diff --git a/packages/ember-views/lib/mixins/action_support.js b/packages/ember-views/lib/mixins/action_support.js
@@ -132,7 +132,9 @@ export default Mixin.create({
       if (!shouldBubble) { return; }
     }
 
-    if (target = get(this, 'target')) {
+    target = get(this, 'target') || get(this, '_targetObject');
+
+    if (target) {
       assert(
         'The `target` for ' + this + ' (' + target +
         ') does not have a `send` method',