[BUGFIX beta] fix regression of clicking link-to with disabled=true

emberjs · Dec 8, 2017 · 52527e0 · 52527e0
1 parent e1dc61f
commit 52527e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/ember-glimmer/lib/components/link-to.ts b/packages/ember-glimmer/lib/components/link-to.ts
@@ -517,7 +517,7 @@ const LinkComponent = EmberComponent.extend({
   */
   init() {
     this._super(...arguments);
-    this._isDisabled = false;
+    this._isDisabled = this._isDisabled || false;
 
     // Map desired event name to invoke function
     let eventName = get(this, 'eventName');

diff --git a/packages/ember/tests/helpers/link_to_test.js b/packages/ember/tests/helpers/link_to_test.js
@@ -134,7 +134,7 @@ moduleFor('The {{link-to}} helper - basic tests', class extends ApplicationTestC
     assert.equal(this.$('#about-link.do-not-want').length, 1, 'The link can apply a custom disabled class via bound param');
   }
 
-  [`@test the {{link-to}} helper does not respond to clicks when disabled`](assert) {
+  [`@test the {{link-to}} helper does not respond to clicks when disabledWhen`](assert) {
     this.addTemplate('index', `
       {{#link-to "about" id="about-link" disabledWhen=true}}About{{/link-to}}
     `);
@@ -145,6 +145,17 @@ moduleFor('The {{link-to}} helper - basic tests', class extends ApplicationTestC
     assert.equal(this.$('h3:contains(About)').length, 0, 'Transitioning did not occur');
   }
 
+  [`@test the {{link-to}} helper does not respond to clicks when disabled`](assert) {
+    this.addTemplate('index', `
+      {{#link-to "about" id="about-link" disabled=true}}About{{/link-to}}
+    `);
+
+    this.visit('/');
+    this.click('#about-link');
+
+    assert.equal(this.$('h3:contains(About)').length, 0, 'Transitioning did not occur');
+  }
+
   [`@test the {{link-to}} helper responds to clicks according to its disabledWhen bound param`](assert) {
     this.addTemplate('index', `
       {{#link-to "about" id="about-link" disabledWhen=disabledWhen}}About{{/link-to}}