diff options
| author | David Bennett | 2013-09-23 21:45:48 -0400 |
|---|---|---|
| committer | Brian Ford | 2013-09-27 16:11:42 -0700 |
| commit | 9a21050b436011693e4eb7e3ace1300a1b0fd2d4 (patch) | |
| tree | 26710b61cc864680a737c2563d67407b53144479 /src/ng/controller.js | |
| parent | 8473b9d5589659b23bfcdd89816339f4bb43d3ba (diff) | |
| download | angular.js-9a21050b436011693e4eb7e3ace1300a1b0fd2d4.tar.bz2 | |
docs(angular.Module): fix controller and directive method parameters
Diffstat (limited to 'src/ng/controller.js')
| -rw-r--r-- | src/ng/controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ng/controller.js b/src/ng/controller.js index 0474e766..d6dedb9b 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -18,7 +18,8 @@ function $ControllerProvider() { * @ngdoc function * @name ng.$controllerProvider#register * @methodOf ng.$controllerProvider - * @param {string} name Controller name + * @param {string|Object} name Controller name, or an object map of controllers where the keys are + * the names and the values are the constructors. * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI * annotations in the array notation). */ |