From 6c41761c1e031a617ddab510769206f39855bfbd Mon Sep 17 00:00:00 2001 From: Miguel Camba Date: Sun, 14 Jun 2015 15:34:05 +0100 Subject: [PATCH] [CLEANUP beta] Remove deprecated LinkView --- packages/ember-routing-views/lib/main.js | 3 +-- packages/ember-routing-views/lib/views/link.js | 16 ---------------- packages/ember-routing-views/tests/main_test.js | 10 ---------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/packages/ember-routing-views/lib/main.js b/packages/ember-routing-views/lib/main.js index 8bef8ad327d..0d504e1fdcf 100644 --- a/packages/ember-routing-views/lib/main.js +++ b/packages/ember-routing-views/lib/main.js @@ -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')) { diff --git a/packages/ember-routing-views/lib/views/link.js b/packages/ember-routing-views/lib/views/link.js index 4964e5c5fa9..058bc7cefec 100644 --- a/packages/ember-routing-views/lib/views/link.js +++ b/packages/ember-routing-views/lib/views/link.js @@ -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; diff --git a/packages/ember-routing-views/tests/main_test.js b/packages/ember-routing-views/tests/main_test.js index 0b335daf33a..6585b010e1f 100644 --- a/packages/ember-routing-views/tests/main_test.js +++ b/packages/ember-routing-views/tests/main_test.js @@ -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({}); -});