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 LinkView #11443

Merged
merged 1 commit into from
Jun 14, 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
3 changes: 1 addition & 2 deletions packages/ember-routing-views/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@

import Ember from "ember-metal/core";
import isEnabled from "ember-metal/features";
import LinkComponent, { DeprecatedLinkView } from "ember-routing-views/views/link";
import LinkComponent from "ember-routing-views/views/link";
import {
OutletView,
CoreOutletView
} from "ember-routing-views/views/outlet";

Ember.LinkView = DeprecatedLinkView;
Ember.LinkComponent = LinkComponent;
Ember.OutletView = OutletView;
if (isEnabled('ember-routing-core-outlet')) {
Expand Down
16 changes: 0 additions & 16 deletions packages/ember-routing-views/lib/views/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,4 @@ function getResolvedQueryParams(queryParamsObject, targetRouteName) {
return resolvedQueryParams;
}

/* DeprecatedLinkView - Start: TODO: Delete in Ember 2.0 */
var DeprecatedLinkView = LinkComponent.extend({
init() {
Ember.deprecate('Ember.LinkView is deprecated. Please use Ember.LinkComponent.', false);
this._super.apply(this, arguments);
}
});
var originalReopen = DeprecatedLinkView.reopen;

DeprecatedLinkView.reopen = function reopenWithDeprecation() {
Ember.deprecate('Ember.LinkView is deprecated. Please use Ember.LinkComponent.', false);
originalReopen.apply(this, arguments);
};
export { DeprecatedLinkView };
/* DeprecatedLinkView - End*/

export default LinkComponent;
10 changes: 0 additions & 10 deletions packages/ember-routing-views/tests/main_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,3 @@ QUnit.test("exports correctly", function() {
ok(Ember.LinkComponent, "LinkComponent is exported correctly");
ok(Ember.OutletView, "OutletView is exported correctly");
});

QUnit.test("Ember.LinkView throws a deprecation warning when instantiated", function() {
expectDeprecation(/Ember.LinkView is deprecated. Please use Ember.LinkComponent/);
Ember.LinkView.create();
});

QUnit.test("Ember.LinkView throws a deprecation warning when reopened", function() {
expectDeprecation(/Ember.LinkView is deprecated. Please use Ember.LinkComponent/);
Ember.LinkView.reopen({});
});