diff options
| author | David Bennett | 2013-09-23 21:45:48 -0400 | 
|---|---|---|
| committer | Brian Ford | 2013-09-27 16:10:43 -0700 | 
| commit | 5bb9ba2c54b341aa9d6a26934831f5b72f24ddac (patch) | |
| tree | f79a5027089db8743136481cdedcd8a6157c9e3d /src/loader.js | |
| parent | e5eeb2e825873977fe3a850f16a658b3783300a2 (diff) | |
| download | angular.js-5bb9ba2c54b341aa9d6a26934831f5b72f24ddac.tar.bz2 | |
docs(angular.Module): fix controller and directive method parameters
Diffstat (limited to 'src/loader.js')
| -rw-r--r-- | src/loader.js | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/src/loader.js b/src/loader.js index 86fb4aa5..0edb7b87 100644 --- a/src/loader.js +++ b/src/loader.js @@ -216,7 +216,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()}. @@ -227,7 +228,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 | 
