aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrice Burgess2012-07-18 14:21:03 -0500
committerMisko Hevery2012-08-30 22:13:20 -0700
commit9a710c788d880785d2b02a9c5411eb15e9c278bf (patch)
tree5055e749fdbd59823366910ff529c239df1a1adc
parent1b34c6d558ab2c138d9e432553f4aebfdeeb5084 (diff)
downloadangular.js-9a710c788d880785d2b02a9c5411eb15e9c278bf.tar.bz2
fix(docs): indicate support for passing a string as the `controller` property on $routeProvider's route object
-rw-r--r--src/ng/route.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ng/route.js b/src/ng/route.js
index f488ebf4..b6b483aa 100644
--- a/src/ng/route.js
+++ b/src/ng/route.js
@@ -27,8 +27,9 @@ function $RouteProvider(){
*
* Object properties:
*
- * - `controller` – `{function()=}` – Controller fn that should be associated with newly
- * created scope.
+ * - `controller` – `{(string|function()=}` – Controller fn that should be associated with newly
+ * created scope or the name of a {@link angular.Module#controller registered controller}
+ * if passed as a string.
* - `template` – `{string=}` – html template as a string that should be used by
* {@link ng.directive:ngView ngView} or
* {@link ng.directive:ngInclude ngInclude} directives.