Fix support for reopening LinkView in 1.13

emberjs · Jun 29, 2015 · 3dea044 · nathanhammond · Jun 30, 2015 · stefanpenner
1 parent 2dcc809
commit 3dea044
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js b/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js
@@ -115,6 +115,23 @@ QUnit.test("unescaped inline form (triple curlies) does not escape link title",
   equal(view.$('b').length, 1, '<b> was found');
 });
 
+QUnit.test("reopening on LinkView actually reopens on LinkComponent", function() {
+  expect(2);
+  var oldreopen = Ember.LinkComponent.reopen;
+
+  Ember.LinkComponent.reopen = function () {
+    ok(true, 'reopen was called on LinkComponent');
+    return oldreopen.apply(this, arguments);
+  };
+
+  expectDeprecation(function () {
+    Ember.LinkView.reopen({});
+  });
+
+  Ember.LinkComponent.reopen = oldreopen;
+
+});
+
 QUnit.test("unwraps controllers", function() {
   var template = "{{#link-to 'index' view.otherController}}Text{{/link-to}}";
 

diff --git a/packages/ember-routing-views/lib/views/link.js b/packages/ember-routing-views/lib/views/link.js
@@ -512,13 +512,20 @@ var DeprecatedLinkView = LinkComponent.extend({
     this._super.apply(this, arguments);
   }
 });
-var originalReopen = DeprecatedLinkView.reopen;
 
 DeprecatedLinkView.reopen = function reopenWithDeprecation() {
   Ember.deprecate('Ember.LinkView is deprecated. Please use Ember.LinkComponent.', false);
 
-  return originalReopen.apply(this, arguments);
+  return LinkComponent.reopen.apply(LinkComponent, arguments);
 };
+
+DeprecatedLinkView.reopenClass({
+  extend: function () {
+    Ember.deprecate('Ember.LinkView is deprecated. Please extend from Ember.LinkComponent.', false);
+    this._super.apply(this, arguments);
+  }
+});
+
 export { DeprecatedLinkView };
 /* DeprecatedLinkView - End*/