From 2d0db1aa9ce433728bb6680fff1adf336d746bc0 Mon Sep 17 00:00:00 2001
From: Sylvain MINA <sylvain.mina@gmail.com>
Date: Fri, 1 Apr 2016 11:09:19 +0200
Subject: [PATCH] [BUGFIX release] re-enable link-to when disabledWhen becomes
 false

---
 .../lib/components/link-to.js                   |  2 +-
 packages/ember/tests/helpers/link_to_test.js    | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/ember-routing-views/lib/components/link-to.js b/packages/ember-routing-views/lib/components/link-to.js
index 6696d47530f..d762c3197bd 100644
--- a/packages/ember-routing-views/lib/components/link-to.js
+++ b/packages/ember-routing-views/lib/components/link-to.js
@@ -772,7 +772,7 @@ let LinkComponent = EmberComponent.extend({
     assert('You must provide one or more parameters to the link-to component.', params.length);
 
     let disabledWhen = get(this, 'disabledWhen');
-    if (disabledWhen) {
+    if (disabledWhen !== undefined) {
       this.set('disabled', disabledWhen);
     }
 
diff --git a/packages/ember/tests/helpers/link_to_test.js b/packages/ember/tests/helpers/link_to_test.js
index 340030fe56a..0b28b96ffb2 100644
--- a/packages/ember/tests/helpers/link_to_test.js
+++ b/packages/ember/tests/helpers/link_to_test.js
@@ -288,6 +288,12 @@ QUnit.test('the {{link-to}} applies a \'disabled\' class when disabled', functio
 
   equal(jQuery('#about-link-static.disabled', '#qunit-fixture').length, 1, 'The static link is disabled when its disabledWhen is true');
   equal(jQuery('#about-link-dynamic.disabled', '#qunit-fixture').length, 1, 'The dynamic link is disabled when its disabledWhen is true');
+
+  run(function() {
+    set(appInstance.lookup('controller:index'), 'dynamicDisabledWhen', false);
+  });
+
+  equal(jQuery('#about-link-dynamic.disabled', '#qunit-fixture').length, 0, 'The dynamic link is re-enabled when its disabledWhen becomes false');
 });
 
 QUnit.test('the {{link-to}} doesn\'t apply a \'disabled\' class if disabledWhen is not provided', function () {
@@ -362,7 +368,7 @@ QUnit.test('the {{link-to}} helper does not respond to clicks when disabled', fu
   equal(jQuery('h3:contains(About)', '#qunit-fixture').length, 0, 'Transitioning did not occur');
 });
 
-QUnit.test('the {{link-to}} helper does not respond to clicks when disabled via a bound param', function () {
+QUnit.test('the {{link-to}} helper responds to clicks according to its disabledWhen bound param', function () {
   Ember.TEMPLATES.index = compile('{{#link-to "about" id="about-link" disabledWhen=disabledWhen}}About{{/link-to}}');
 
   Router.map(function() {
@@ -384,6 +390,15 @@ QUnit.test('the {{link-to}} helper does not respond to clicks when disabled via
   });
 
   equal(jQuery('h3:contains(About)', '#qunit-fixture').length, 0, 'Transitioning did not occur');
+
+  run(function() {
+    set(appInstance.lookup('controller:index'), 'disabledWhen', false);
+  });
+  run(function() {
+    jQuery('#about-link', '#qunit-fixture').click();
+  });
+
+  equal(jQuery('h3:contains(About)', '#qunit-fixture').length, 1, 'Transitioning did occur when disabledWhen became false');
 });
 
 QUnit.test('The {{link-to}} helper supports a custom activeClass', function() {