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 beta] Remove deprecated Ember.View support from Ember global #11794

Merged
merged 1 commit into from Jul 17, 2015
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
28 changes: 19 additions & 9 deletions packages/ember-views/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,24 @@ ViewUtils.isSimpleClick = isSimpleClick;
ViewUtils.getViewClientRects = getViewClientRects;
ViewUtils.getViewBoundingClientRect = getViewBoundingClientRect;

Ember.CoreView = DeprecatedCoreView;
Ember.View = DeprecatedView;
Ember.View.states = states;
Ember.View.cloneStates = cloneStates;
Ember.View._Renderer = Renderer;
if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
Ember.CoreView = DeprecatedCoreView;
Ember.View = DeprecatedView;
Ember.View.states = states;
Ember.View.cloneStates = cloneStates;
Ember.View._Renderer = Renderer;
}

Ember._Renderer = Renderer;

Ember.Checkbox = Checkbox;
Ember.TextField = TextField;
Ember.TextArea = TextArea;

Ember.Select = DeprecatedSelect;
if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
Ember.Select = DeprecatedSelect;
}

Ember.SelectOption = SelectOption;
Ember.SelectOptgroup = SelectOptgroup;

Expand All @@ -83,9 +91,11 @@ Ember.Component = Component;
Ember.EventDispatcher = EventDispatcher;

// Deprecated:
Ember._Metamorph = _Metamorph;
Ember._MetamorphView = _MetamorphView;
Ember._LegacyEachView = LegacyEachView;
if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
Ember._Metamorph = _Metamorph;
Ember._MetamorphView = _MetamorphView;
Ember._LegacyEachView = LegacyEachView;
}

// END EXPORTS

Expand Down
32 changes: 0 additions & 32 deletions packages/ember-views/tests/views/exports_test.js

This file was deleted.

6 changes: 0 additions & 6 deletions packages/ember-views/tests/views/select_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ function selectedOptions() {
return select.get('childViews').mapBy('selected');
}

QUnit.test('using the Ember.Select global is deprecated', function(assert) {
expectDeprecation(function() {
Ember.Select.create();
}, /Ember.Select is deprecated./);
});

QUnit.test('has \'ember-view\' and \'ember-select\' CSS classes', function() {
deepEqual(select.get('classNames'), ['ember-view', 'ember-select']);
});
Expand Down
12 changes: 6 additions & 6 deletions tests/node/app-boot-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function registerDOMHelper(app) {
initialize: function(app) {
app.registry.register('renderer:-dom', {
create: function() {
return new Ember.View._Renderer(domHelper, false);
return new Ember._Renderer(domHelper, false);
}
});
}
Expand Down Expand Up @@ -151,8 +151,8 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {
});

QUnit.test("It is possible to render a view in Node", function(assert) {
var View = Ember.View.extend({
renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
var View = Ember.Component.extend({
renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
template: compile("<h1>Hello</h1>")
});

Expand All @@ -168,7 +168,7 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {

QUnit.test("It is possible to render a view with curlies in Node", function(assert) {
var View = Ember.Component.extend({
renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
layout: compile("<h1>Hello {{location}}</h1>"),
location: "World"
});
Expand All @@ -186,11 +186,11 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {

QUnit.test("It is possible to render a view with a nested {{view}} helper in Node", function(assert) {
var View = Ember.Component.extend({
renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
layout: compile("<h1>Hello {{#if hasExistence}}{{location}}{{/if}}</h1> <div>{{view bar}}</div>"),
location: "World",
hasExistence: true,
bar: Ember.View.extend({
bar: Ember.Component.extend({
template: compile("<p>The files are *inside* the computer?!</p>")
})
});
Expand Down