Add more requested changes

asakusuma · Jun 18, 2017 · 213121e · 213121e
1 parent eb2559f
commit 213121e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/ember-application/lib/system/application-instance.js b/packages/ember-application/lib/system/application-instance.js
@@ -235,7 +235,7 @@ const ApplicationInstance = EngineInstance.extend({
 
     @public
     @param url {String} the destination URL
-    @return {Promise<undefined>}
+    @return {Promise<Ember.ApplicationInstance>}
   */
   visit(url) {
     this.setupRouter();

diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -1371,7 +1371,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
 
     @method beforeModel
     @param {Transition} transition
-    @return {Promise<any>} if the value returned from this hook is
+    @return {any | Promise<any>} if the value returned from this hook is
       a promise, the transition will pause until the transition
       resolves. Otherwise, non-promise return values are not
       utilized in any way.
@@ -1408,7 +1408,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
     @param {Object} resolvedModel the value returned from `model`,
       or its resolved value if it was a promise
     @param {Transition} transition
-    @return {Promise<any>} if the value returned from this hook is
+    @return {any | Promise<any>} if the value returned from this hook is
       a promise, the transition will pause until the transition
       resolves. Otherwise, non-promise return values are not
       utilized in any way.
@@ -1527,7 +1527,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
     @method model
     @param {Object} params the parameters extracted from the URL
     @param {Transition} transition
-    @return {Object|Promise<Object>} the model for this route. If
+    @return {any | Promise<any>} the model for this route. If
       a promise is returned, the transition will pause until
       the promise resolves, and the resolved value of the promise
       will be used as the model for this route.
@@ -1568,7 +1568,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
     @method deserialize
     @param {Object} params the parameters extracted from the URL
     @param {Transition} transition
-    @return {Object|Promise<Object>} the model for this route.
+    @return {any | Promise<any>} the model for this route.
 
     Router.js hook.
    */