Merge pull request #13757 from rwjblue/remove-more-view-cruft

View cruft removal.

packages/ember-glimmer/lib/component.js

@@ -1,6 +1,6 @@
 import CoreView from 'ember-views/views/core_view';
-import ChildViewsSupport from './ember-views/child-views-support';
 import ClassNamesSupport from './ember-views/class-names-support';
+import ChildViewsSupport from 'ember-views/mixins/child_views_support';
 import ViewStateSupport from 'ember-views/mixins/view_state_support';
 import InstrumentationSupport from 'ember-views/mixins/instrumentation_support';
 import AriaRoleSupport from 'ember-views/mixins/aria_role_support';
@@ -44,16 +44,13 @@ const Component = CoreView.extend(
     isComponent: true,
     layoutName: null,
     layout: null,
-    controller: null,
-    _controller: null,
 
     init() {
       this._super(...arguments);
       this._viewRegistry = this._viewRegistry || EmberView.views;
       this[DIRTY_TAG] = new DirtyableTag();
       this[ROOT_REF] = null;
       this[REFS] = new EmptyObject();
-      this.controller = this;
 
       // If a `defaultLayout` was specified move it to the `layout` prop.
       // `layout` is no longer a CP, so this just ensures that the `defaultLayout`

packages/ember-glimmer/lib/renderer.js

@@ -155,7 +155,11 @@ class Renderer {
     let dynamicScope = new DynamicScope({
       view,
       controller: undefined,
-      targetObject: undefined,
+      // this is generally only used for the test harness, and is not a "supported"
+      // mechanism for setting up a template/test environment. We are defaulting the
+      // targetObject to the view instance based on the assumption that it is a component
+      // instance
+      targetObject: view,
       outletState: UNDEFINED_REFERENCE,
       isTopLevel: true
     });

packages/ember-glimmer/tests/integration/helpers/get-test.js

@@ -454,7 +454,7 @@ moduleFor('Helpers test: {{get}}', class extends RenderingTest {
 
     assert.strictEqual(this.$('#get-input').val(), 'banana');
 
-    this.runTask(() => set(this.context, 'context.source.banana', 'yellow'));
+    this.runTask(() => set(this.context, 'source.banana', 'yellow'));
 
     assert.strictEqual(this.$('#get-input').val(), 'yellow');
 

packages/ember-htmlbars/lib/component.js

@@ -6,7 +6,6 @@ import TargetActionSupport from 'ember-runtime/mixins/target_action_support';
 import ActionSupport from 'ember-views/mixins/action_support';
 import View from 'ember-views/views/view';
 
-import { set } from 'ember-metal/property_set';
 import { computed } from 'ember-metal/computed';
 
 import { getOwner } from 'container/owner';
@@ -108,12 +107,6 @@ export let HAS_BLOCK = symbol('HAS_BLOCK');
 */
 const Component = View.extend(TargetActionSupport, ActionSupport, {
   isComponent: true,
-  /*
-    This is set so that the proto inspection in appendTemplatedView does not
-    think that it should set the component's `context` to that of the parent view.
-  */
-  controller: null,
-  context: null,
 
   instrumentName: 'component',
   instrumentDisplay: computed(function() {
@@ -124,8 +117,6 @@ const Component = View.extend(TargetActionSupport, ActionSupport, {
 
   init() {
     this._super(...arguments);
-    set(this, 'controller', this);
-    set(this, 'context', this);
 
     // If a `defaultLayout` was specified move it to the `layout` prop.
     // `layout` is no longer a CP, so this just ensures that the `defaultLayout`

packages/ember-htmlbars/lib/node-managers/component-node-manager.js

@@ -2,7 +2,6 @@ import { assert, warn } from 'ember-metal/debug';
 import buildComponentTemplate from 'ember-htmlbars/system/build-component-template';
 import getCellOrValue from 'ember-htmlbars/hooks/get-cell-or-value';
 import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
 import { MUTABLE_CELL } from 'ember-views/compat/attrs-proxy';
 import { instrument } from 'ember-htmlbars/system/instrumentation-support';
 import LegacyEmberComponent, { HAS_BLOCK } from 'ember-htmlbars/component';
@@ -47,14 +46,8 @@ ComponentNodeManager.create = function ComponentNodeManager_create(renderNode, e
   // properties ({ id: "foo" }).
   configureCreateOptions(attrs, createOptions);
 
-  // If there is a controller on the scope, pluck it off and save it on the
-  // component. This allows the component to target actions sent via
-  // `sendAction` correctly.
-  if (parentScope.hasLocal('controller')) {
-    createOptions._controller = getValue(parentScope.getLocal('controller'));
-  } else {
-    createOptions._targetObject = getValue(parentScope.getSelf());
-  }
+  // This allows the component to target actions sent via `sendAction` correctly.
+  createOptions._targetObject = getValue(parentScope.getSelf());
 
   extractPositionalParams(renderNode, component, params, attrs);
 
@@ -94,7 +87,6 @@ function configureCreateOptions(attrs, createOptions) {
   // they are still streams.
   if (attrs.id) { createOptions.elementId = getValue(attrs.id); }
   if (attrs._defaultTagName) { createOptions._defaultTagName = getValue(attrs._defaultTagName); }
-  if (attrs.viewName) { createOptions.viewName = getValue(attrs.viewName); }
 }
 
 ComponentNodeManager.prototype.render = function ComponentNodeManager_render(_env, visitor) {
@@ -183,10 +175,6 @@ export function createComponent(_component, props, renderNode, env, attrs = {})
 
   if (props.parentView) {
     props.parentView.appendChild(component);
-
-    if (props.viewName) {
-      set(props.parentView, props.viewName, component);
-    }
   }
 
   component._renderNode = renderNode;

packages/ember-htmlbars/lib/node-managers/view-node-manager.js

@@ -2,7 +2,6 @@ import assign from 'ember-metal/assign';
 import { assert, warn } from 'ember-metal/debug';
 import buildComponentTemplate from 'ember-htmlbars/system/build-component-template';
 import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
 import setProperties from 'ember-metal/set_properties';
 import View from 'ember-views/views/view';
 import { MUTABLE_CELL } from 'ember-views/compat/attrs-proxy';
@@ -43,7 +42,6 @@ ViewNodeManager.create = function ViewNodeManager_create(renderNode, env, attrs,
     if (attrs && attrs.id) { options.elementId = getValue(attrs.id); }
     if (attrs && attrs.tagName) { options.tagName = getValue(attrs.tagName); }
     if (attrs && attrs._defaultTagName) { options._defaultTagName = getValue(attrs._defaultTagName); }
-    if (attrs && attrs.viewName) { options.viewName = getValue(attrs.viewName); }
 
     if (found.component.create && contentScope) {
       let _self = contentScope.getSelf();
@@ -211,10 +209,6 @@ export function createOrUpdateComponent(component, options, createOptions, rende
 
   if (options.parentView) {
     options.parentView.appendChild(component);
-
-    if (options.viewName) {
-      set(options.parentView, options.viewName, component);
-    }
   }
 
   component._renderNode = renderNode;

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

@@ -31,8 +31,6 @@ export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecatio
   */
   target: null,
 
-  parentController: null,
-
   store: null,
 
   /**

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

@@ -160,11 +160,5 @@ function getTarget(instance) {
     }
   }
 
-  if (instance._controller) { return instance._controller; }
-
-  // fallback to `parentView.controller`
-  let parentViewController = get(instance, 'parentView.controller');
-  if (parentViewController) { return parentViewController; }
-
   return null;
 }

packages/ember-glimmer/lib/ember-views/child-views-support.js → packages/ember-views/lib/mixins/child_views_support.js

@@ -19,7 +19,6 @@ export default Mixin.create({
       @private
     */
     this.childViews = [];
-    this.parentView = null;
     this.ownerView = this.ownerView || this;
   },