Merge pull request #13144 from HeroicEric/remove-view-select

[CLEANUP canary] Remove Ember.Select
emberjs · Mar 21, 2016 · bab4447 · bab4447
2 parents f3eea41 + 4b5b972
commit bab4447
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1,939 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -11,7 +11,6 @@ import Controller from 'ember-runtime/controllers/controller';
 import { Renderer } from 'ember-metal-views';
 import DOMHelper from 'ember-htmlbars/system/dom-helper';
 import topLevelViewTemplate from 'ember-htmlbars/templates/top-level-view';
-import SelectView from 'ember-views/views/select';
 import { OutletView } from 'ember-routing-views/views/outlet';
 import EmberView from 'ember-views/views/view';
 import EventDispatcher from 'ember-views/system/event_dispatcher';
@@ -1060,9 +1059,6 @@ Application.reopenClass({
     registry.register('renderer:-dom', { create() { return new Renderer(new DOMHelper()); } });
 
     registry.injection('view', 'renderer', 'renderer:-dom');
-    if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
-      registry.register('view:select', SelectView);
-    }
     registry.register('view:-outlet', OutletView);
 
     registry.register('-view-registry:main', { create() { return {}; } });

diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
@@ -338,16 +338,6 @@ QUnit.test('can specify custom router', function() {
   ok(app.__container__.lookup('router:main') instanceof CustomRouter, 'application resolved the correct router');
 });
 
-QUnit.test('registers controls onto to container', function() {
-  run(function() {
-    app = Application.create({
-      rootElement: '#qunit-fixture'
-    });
-  });
-
-  ok(app.__container__.lookup('view:select'), 'Select control is registered into views');
-});
-
 QUnit.test('does not leak itself in onLoad._loaded', function() {
   equal(_loaded.application, undefined);
   var app = run(Application, 'create');

diff --git a/packages/ember-htmlbars/lib/templates/select-optgroup.hbs b/packages/ember-htmlbars/lib/templates/select-optgroup.hbs
diff --git a/packages/ember-htmlbars/lib/templates/select-option.hbs b/packages/ember-htmlbars/lib/templates/select-option.hbs
diff --git a/packages/ember-htmlbars/lib/templates/select.hbs b/packages/ember-htmlbars/lib/templates/select.hbs
diff --git a/packages/ember-htmlbars/tests/compat/view_helper_test.js b/packages/ember-htmlbars/tests/compat/view_helper_test.js
@@ -1,7 +1,6 @@
 import Ember from 'ember-metal/core';
 import EmberComponent from 'ember-views/components/component';
 import EmberView from 'ember-views/views/view';
-import EmberSelectView from 'ember-views/views/select';
 import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
 import compile from 'ember-template-compiler/system/compile';
 import { OWNER } from 'container/owner';
@@ -101,18 +100,3 @@ QUnit.test('using the view helper with a string (block form) fails assertion [LE
 
   assert.equal(component.$().text(), 'Foo says: I am foo', 'view helper is still rendered');
 });
-
-QUnit.test('using the view helper with string "select" fails assertion [LEGACY]', function(assert) {
-  owner.register('view:select', EmberSelectView);
-
-  ignoreAssertion(function() {
-    component = EmberComponent.extend({
-      [OWNER]: owner,
-      layout: compile('{{view \'select\'}}')
-    }).create();
-
-    runAppend(component);
-  });
-
-  assert.ok(!!component.$('select').length, 'still renders select');
-});