port to v3.6

Author: locks

guides/v3.6.0/applications/dependency-injection.md

@@ -247,8 +247,10 @@ export default Component.extend({
     if (!this.song) {
       return null;
     }
+
     let applicationInstance = getOwner(this);
     let audioType = this.song.audioType;
+
     return applicationInstance.lookup(`service:audio-${audioType}`);
   }),
 

guides/v3.6.0/configuring-ember/embedding-applications.md

@@ -14,7 +14,9 @@ You can tell the application to append the application template to a
 different element by specifying its `rootElement` property:
 
 ```javascript {data-filename="app/app.js" data-diff="+4"}
-…
+import Application from '@ember/application';
+
+// …
 
 App = Ember.Application.extend({
   rootElement: '#app',
@@ -23,7 +25,7 @@ App = Ember.Application.extend({
   Resolver
 });
 
-…
+// …
 ```
 
 This property can be specified as either an element or a

guides/v3.6.0/routing/preventing-and-retrying-transitions.md

@@ -25,7 +25,7 @@ import Route from '@ember/routing/route';
 export default Route.extend({
   actions: {
     willTransition(transition) {
-      if (this.controller.get('userHasEnteredData') &&
+      if (this.controller.userHasEnteredData &&
           !confirm('Are you sure you want to abandon progress?')) {
         transition.abort();
       } else {
@@ -78,7 +78,7 @@ import Route from '@ember/routing/route';
 
 export default Route.extend({
   beforeModel(transition) {
-    if (!this.controllerFor('auth').get('userIsLoggedIn')) {
+    if (!this.controllerFor('auth').userIsLoggedIn) {
       let loginController = this.controllerFor('login');
       loginController.set('previousTransition', transition);
       this.transitionTo('login');