From e9f65000e5ad43c2e1c8121f0724c94a2af169ec Mon Sep 17 00:00:00 2001 From: Chris Westra Date: Fri, 3 Mar 2017 12:50:48 -0500 Subject: [PATCH 1/2] Document setupController hook behavior further The default implementation doesn't update the `model` property of the controller if the resolved model is undefined. This isn't currently documented. --- packages/ember-routing/lib/system/route.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js index 50d2df4aab7..15d905cf61e 100644 --- a/packages/ember-routing/lib/system/route.js +++ b/packages/ember-routing/lib/system/route.js @@ -1703,7 +1703,8 @@ let Route = EmberObject.extend(ActionHandler, Evented, { model supplied by the `model` hook. By default, the `setupController` hook sets the `model` property of - the controller to the `model`. + the controller to the `model`. If `model` is `undefined`, the default + implementation will _not_ update the `model` property of the controller. If you implement the `setupController` hook in your Route, it will prevent this default behavior. If you want to preserve that behavior From 4c8efd15e5063fcf200abf13950151071369c827 Mon Sep 17 00:00:00 2001 From: Chris Westra Date: Mon, 3 Apr 2017 12:28:38 -0400 Subject: [PATCH 2/2] Better wording for setupController documentation One good sentence is better than two. --- packages/ember-routing/lib/system/route.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js index 15d905cf61e..be0232a3614 100644 --- a/packages/ember-routing/lib/system/route.js +++ b/packages/ember-routing/lib/system/route.js @@ -1703,8 +1703,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, { model supplied by the `model` hook. By default, the `setupController` hook sets the `model` property of - the controller to the `model`. If `model` is `undefined`, the default - implementation will _not_ update the `model` property of the controller. + the controller to the specified `model` when it is not `undefined`. If you implement the `setupController` hook in your Route, it will prevent this default behavior. If you want to preserve that behavior