From 400f9360bb2f7553c5bd3b1f256a5f3db175b7bc Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 29 Apr 2013 14:27:45 -0400
Subject: fix(ngController): change controllerAlias to controllerAs.

---
 src/ng/directive/ngView.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ng/directive')

diff --git a/src/ng/directive/ngView.js b/src/ng/directive/ngView.js
index 8d7c87c5..d5ef2c71 100644
--- a/src/ng/directive/ngView.js
+++ b/src/ng/directive/ngView.js
@@ -105,12 +105,12 @@
           $routeProvider.when('/Book/:bookId', {
             templateUrl: 'book.html',
             controller: BookCntl,
-            controllerAlias: 'book'
+            controllerAs: 'book'
           });
           $routeProvider.when('/Book/:bookId/ch/:chapterId', {
             templateUrl: 'chapter.html',
             controller: ChapterCntl,
-            controllerAlias: 'chapter'
+            controllerAs: 'chapter'
           });
 
           // configure html5 to get links working on jsfiddle
@@ -204,8 +204,8 @@ var ngViewDirective = ['$http', '$templateCache', '$route', '$anchorScroll', '$c
           if (current.controller) {
             locals.$scope = lastScope;
             controller = $controller(current.controller, locals);
-            if (current.controllerAlias) {
-              lastScope[current.controllerAlias] = controller;
+            if (current.controllerAs) {
+              lastScope[current.controllerAs] = controller;
             }
             element.children().data('$ngControllerController', controller);
           }
-- 
cgit v1.2.3