Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLEANUP canary] Remove Ember.Select #13144

Merged
merged 1 commit into from
Mar 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/ember-application/lib/system/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 {}; } });
Expand Down
10 changes: 0 additions & 10 deletions packages/ember-application/tests/system/application_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion packages/ember-htmlbars/lib/templates/select-optgroup.hbs

This file was deleted.

1 change: 0 additions & 1 deletion packages/ember-htmlbars/lib/templates/select-option.hbs

This file was deleted.

1 change: 0 additions & 1 deletion packages/ember-htmlbars/lib/templates/select.hbs

This file was deleted.

16 changes: 0 additions & 16 deletions packages/ember-htmlbars/tests/compat/view_helper_test.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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');
});
Loading