aboutsummaryrefslogtreecommitdiffstats
path: root/src/loader.js
diff options
context:
space:
mode:
authorIgor Minar2012-03-26 13:01:24 -0700
committerIgor Minar2012-03-26 15:23:29 -0700
commitd54dfecb00fba41455536c5ddd55310592fdaf84 (patch)
treefa146933a2056b69c558f8e0bc0d15a315afeaaa /src/loader.js
parent4b8d926062eb4d4483555bdbdec4656f585ab40b (diff)
downloadangular.js-d54dfecb00fba41455536c5ddd55310592fdaf84.tar.bz2
feat($controller): support controller registration via $controllerProvider
It's now possible to register controllers as: .register('MyCtrl', function($scope) { ... }); // or .register('MyCtrl', ['$scope', function($scope) { ... }); Additionally a module loader shortcut api was added as well: myModule.controller('MyCtr', function($scope) { ... });
Diffstat (limited to 'src/loader.js')
-rw-r--r--src/loader.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/loader.js b/src/loader.js
index fdfdaebd..b25fc40e 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -167,7 +167,7 @@ function setupModuleLoader(window) {
* @ngdoc method
* @name angular.Module#filter
* @methodOf angular.Module
- * @param {string} name filter name
+ * @param {string} name Filter name.
* @param {Function} filterFactory Factory function for creating new instance of filter.
* @description
* See {@link angular.module.ng.$filterProvider#register $filterProvider.register()}.
@@ -176,6 +176,17 @@ function setupModuleLoader(window) {
/**
* @ngdoc method
+ * @name angular.Module#controller
+ * @methodOf angular.Module
+ * @param {string} name Controller name.
+ * @param {Function} constructor Controller constructor function.
+ * @description
+ * See {@link angular.module.ng.$controllerProvider#register $controllerProvider.register()}.
+ */
+ controller: invokeLater('$controllerProvider', 'register'),
+
+ /**
+ * @ngdoc method
* @name angular.Module#directive
* @methodOf angular.Module
* @param {string} name directive name