Skip to content

Commit

Permalink
Merge pull request angular-fullstack#1294 from DaftMonk/fix/controlle…
Browse files Browse the repository at this point in the history
…r-as-property

fix(app): correct `controllerAs` property
  • Loading branch information
Awk34 committed Sep 12, 2015
2 parents f5c4048 + 8777407 commit 44aa8f5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/templates/client/app/main/main(js).js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ angular.module('<%= scriptAppName %>')
.when('/', {
templateUrl: 'app/main/main.html',
controller: 'MainController',
conterollerAs: 'main'
controllerAs: 'main'
});
});<% } %><% if (filters.uirouter) { %>.config(function($stateProvider) {
$stateProvider
.state('main', {
url: '/',
templateUrl: 'app/main/main.html',
controller: 'MainController',
conterollerAs: 'main'
controllerAs: 'main'
});
});<% } %>

0 comments on commit 44aa8f5

Please sign in to comment.