diff options
| author | Misko Hevery | 2012-04-28 22:23:38 -0700 |
|---|---|---|
| committer | Misko Hevery | 2012-05-04 15:50:37 -0700 |
| commit | cef3535c16d5b7825f797adc6705d61dad759796 (patch) | |
| tree | 15b5a8f83bf530bfe5dcaefa7bac5661daf3dfdb /src/ng/controller.js | |
| parent | fbb499e0a82ba9b816916f275d786775aa6cf467 (diff) | |
| download | angular.js-cef3535c16d5b7825f797adc6705d61dad759796.tar.bz2 | |
chore(controller): allow setting map of controllers
Diffstat (limited to 'src/ng/controller.js')
| -rw-r--r-- | src/ng/controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ng/controller.js b/src/ng/controller.js index fa90f8cd..67f70aad 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -23,7 +23,11 @@ function $ControllerProvider() { * annotations in the array notation). */ this.register = function(name, constructor) { - controllers[name] = constructor; + if (isObject(name)) { + extend(controllers, name) + } else { + controllers[name] = constructor; + } }; |