aboutsummaryrefslogtreecommitdiffstats
path: root/src/loader.js
diff options
context:
space:
mode:
authorDavid Bennett2013-09-23 21:45:48 -0400
committerBrian Ford2013-09-27 16:11:42 -0700
commit9a21050b436011693e4eb7e3ace1300a1b0fd2d4 (patch)
tree26710b61cc864680a737c2563d67407b53144479 /src/loader.js
parent8473b9d5589659b23bfcdd89816339f4bb43d3ba (diff)
downloadangular.js-9a21050b436011693e4eb7e3ace1300a1b0fd2d4.tar.bz2
docs(angular.Module): fix controller and directive method parameters
Diffstat (limited to 'src/loader.js')
-rw-r--r--src/loader.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/loader.js b/src/loader.js
index 915d338a..a239fa04 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -178,7 +178,8 @@ function setupModuleLoader(window) {
* @ngdoc method
* @name angular.Module#controller
* @methodOf angular.Module
- * @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} constructor Controller constructor function.
* @description
* See {@link ng.$controllerProvider#register $controllerProvider.register()}.
@@ -189,7 +190,8 @@ function setupModuleLoader(window) {
* @ngdoc method
* @name angular.Module#directive
* @methodOf angular.Module
- * @param {string} name directive name
+ * @param {string|Object} name Directive name, or an object map of directives where the
+ * keys are the names and the values are the factories.
* @param {Function} directiveFactory Factory function for creating new instance of
* directives.
* @description