Merge pull request #13755 from rwjblue/remove-targetobject-computed

Remove usage of `targetObject` computed property.

Author: tomdale

packages/ember-glimmer/lib/syntax/curly-component.js

@@ -74,19 +74,15 @@ class CurlyComponentManager {
 
     props.renderer = parentView.renderer;
     props[HAS_BLOCK] = hasBlock;
+    // parentView.controller represents any parent components
+    // dynamicScope.controller represents the outlet controller
+    props._targetObject = parentView.controller || dynamicScope.controller;
 
     let component = klass.create(props);
 
     dynamicScope.view = component;
     parentView.appendChild(component);
 
-    if (parentView.controller) {
-      dynamicScope.controller = parentView.controller;
-    }
-
-    component._controller = dynamicScope.controller;
-
-
     component.trigger('didInitAttrs', { attrs });
     component.trigger('didReceiveAttrs', { newAttrs: attrs });
     component.trigger('willInsertElement');

packages/ember-runtime/lib/mixins/target_action_support.js

@@ -29,25 +29,6 @@ export default Mixin.create({
   action: null,
   actionContext: null,
 
-  targetObject: computed('target', function() {
-    if (this._targetObject) {
-      return this._targetObject;
-    }
-
-    let target = get(this, 'target');
-
-    if (typeof target === 'string') {
-      let value = get(this, target);
-      if (value === undefined) {
-        value = get(context.lookup, target);
-      }
-
-      return value;
-    } else {
-      return target;
-    }
-  }),
-
   actionContextObject: computed('actionContext', function() {
     let actionContext = get(this, 'actionContext');
 
@@ -115,7 +96,12 @@ export default Mixin.create({
   */
   triggerAction(opts = {}) {
     let action = opts.action || get(this, 'action');
-    let target = opts.target || get(this, 'targetObject');
+    let target = opts.target;
+
+    if (!target) {
+      target = getTarget(this);
+    }
+
     let actionContext = opts.actionContext;
 
     function args(options, actionName) {
@@ -149,3 +135,36 @@ export default Mixin.create({
     }
   }
 });
+
+function getTarget(instance) {
+  // TODO: Deprecate specifying `targetObject`
+  let target = get(instance, 'targetObject');
+
+  // if a `targetObject` CP was provided, use it
+  if (target) { return target; }
+
+  // if _targetObject use it
+  if (instance._targetObject) { return instance._targetObject; }
+
+  target = get(instance, 'target');
+  if (target) {
+    if (typeof target === 'string') {
+      let value = get(instance, target);
+      if (value === undefined) {
+        value = get(context.lookup, target);
+      }
+
+      return value;
+    } else {
+      return target;
+    }
+  }
+
+  if (instance._controller) { return instance._controller; }
+
+  // fallback to `parentView.controller`
+  let parentViewController = get(instance, 'parentView.controller');
+  if (parentViewController) { return parentViewController; }
+
+  return null;
+}

packages/ember-views/lib/mixins/action_support.js

@@ -1,5 +1,4 @@
 import { Mixin } from 'ember-metal/mixin';
-import { computed } from 'ember-metal/computed';
 import { get } from 'ember-metal/property_get';
 import isNone from 'ember-metal/is_none';
 import { assert } from 'ember-metal/debug';
@@ -124,22 +123,6 @@ export default Mixin.create({
     }
   },
 
-  /**
-    If the component is currently inserted into the DOM of a parent view, this
-    property will point to the controller of the parent view.
-
-    @property targetObject
-    @type Ember.Controller
-    @default null
-    @private
-  */
-  targetObject: computed('controller', function(key) {
-    if (this._targetObject) { return this._targetObject; }
-    if (this._controller) { return this._controller; }
-    let parentView = get(this, 'parentView');
-    return parentView ? get(parentView, 'controller') : null;
-  }),
-
   send(actionName, ...args) {
     let target;
     let action = this.actions && this.actions[actionName];