From 7b8844fab7f42065581c1c0ea5b5efc987a888cb Mon Sep 17 00:00:00 2001 From: HenriqueLimas Date: Tue, 11 Nov 2014 16:04:54 -0200 Subject: [PATCH 1/3] docs($controller): add controllerAs definition --- src/ng/controller.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ng/controller.js b/src/ng/controller.js index c16db5bd5224..08c9781baa6d 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -58,6 +58,8 @@ function $ControllerProvider() { * * check if evaluating the string on the current scope returns a constructor * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global * `window` object (not recommended) + * * if use controllerAs syntax, the controller instance is published into a scope property. + * (scope must be injected into locals param) * * @param {Object} locals Injection locals for Controller. * @return {Object} Instance of given controller. From c363eed15197fd850280c653f88435c78e79a24e Mon Sep 17 00:00:00 2001 From: Henrique Ramos Limas Date: Tue, 11 Nov 2014 20:28:49 -0200 Subject: [PATCH 2/3] docs(): add controllerAs definition --- src/ng/controller.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ng/controller.js b/src/ng/controller.js index 08c9781baa6d..05bd78e1a543 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -58,8 +58,9 @@ function $ControllerProvider() { * * check if evaluating the string on the current scope returns a constructor * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global * `window` object (not recommended) - * * if use controllerAs syntax, the controller instance is published into a scope property. - * (scope must be injected into locals param) + * + * If use a string with `controller as` syntax, the controller instance is published into a `scope` + * property, but the `scope` must be injected into `locals` param. * * @param {Object} locals Injection locals for Controller. * @return {Object} Instance of given controller. From c39eb3973eedd0c204506f5d1a97506aee68b11c Mon Sep 17 00:00:00 2001 From: Henrique Ramos Limas Date: Tue, 11 Nov 2014 20:45:28 -0200 Subject: [PATCH 3/3] docs($controller): add controllerAs definition --- src/ng/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ng/controller.js b/src/ng/controller.js index 05bd78e1a543..32efd65aef81 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -59,7 +59,7 @@ function $ControllerProvider() { * * if $controllerProvider#allowGlobals, check `window[constructor]` on the global * `window` object (not recommended) * - * If use a string with `controller as` syntax, the controller instance is published into a `scope` + * If use a string with `controller as` syntax, the controller instance is published into a `scope` * property, but the `scope` must be injected into `locals` param. * * @param {Object} locals Injection locals for Controller.