aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPete Bacon Darwin2013-10-24 22:36:05 +0100
committerPete Bacon Darwin2013-10-24 22:36:40 +0100
commit82dec9b81e8e66d3fb63c3e7690b4bf5318dc65e (patch)
tree148f8975f11dcd0a51e50eada6cdcf51ce329f50
parent76b628bcb3511210d312ed667e5c14d908a9fed1 (diff)
downloadangular.js-82dec9b81e8e66d3fb63c3e7690b4bf5318dc65e.tar.bz2
style($route): fix line length
-rw-r--r--src/ngRoute/route.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js
index 61004b3a..cf6e9991 100644
--- a/src/ngRoute/route.js
+++ b/src/ngRoute/route.js
@@ -89,12 +89,14 @@ function $RouteProvider(){
* `$location.path()` by applying the current route
*
* - `resolve` - `{Object.<string, function>=}` - An optional map of dependencies which should
- * be injected into the controller. If any of these dependencies are promises, the router will
- * wait for them all to be resolved or one to be rejected before the controller is instantiated.
- * If all the promises are resolved successfully, the values of the resolved promises are injected
- * and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is fired.
- * If any of the promises are rejected the {@link ngRoute.$route#$routeChangeError $routeChangeError}
- * event is fired. The map object is:
+ * be injected into the controller. If any of these dependencies are promises, the router
+ * will wait for them all to be resolved or one to be rejected before the controller is
+ * instantiated.
+ * If all the promises are resolved successfully, the values of the resolved promises are
+ * injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is
+ * fired. If any of the promises are rejected the
+ * {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired. The map object
+ * is:
*
* - `key` – `{string}`: a name of a dependency to be injected into the controller.
* - `factory` - `{string|function}`: If `string` then it is an alias for a service.