Skip to content

Commit 64a69bc

Browse files
Awk34Awk34
committed
fix(app): rename navbar controllerAs from 'vm' to 'nav'
1 parent ccbab74 commit 64a69bc

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Diff for: ‎app/templates/client/components/navbar/navbar(html).html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<div class="navbar navbar-default navbar-static-top" ng-controller="NavbarController">
22
<div class="container">
33
<div class="navbar-header">
4-
<button class="navbar-toggle" type="button" ng-click="vm.isCollapsed = !vm.isCollapsed">
4+
<button class="navbar-toggle" type="button" ng-click="nav.isCollapsed = !nav.isCollapsed">
55
<span class="sr-only">Toggle navigation</span>
66
<span class="icon-bar"></span>
77
<span class="icon-bar"></span>
88
<span class="icon-bar"></span>
99
</button>
1010
<a href="/" class="navbar-brand"><%= lodash.slugify(lodash.humanize(appname)) %></a>
1111
</div>
12-
<div collapse="vm.isCollapsed" class="navbar-collapse collapse" id="navbar-main">
12+
<div collapse="nav.isCollapsed" class="navbar-collapse collapse" id="navbar-main">
1313
<ul class="nav navbar-nav">
14-
<li ng-repeat="item in vm.menu" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: vm.isActive(item.link)}"<% } %>>
14+
<li ng-repeat="item in nav.menu" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: nav.isActive(item.link)}"<% } %>>
1515
<a <% if (filters.uirouter) { %>ui-sref="{{item.state}}"<% } else { %>ng-href="{{item.link}}"<% } %>>{{item.title}}</a>
1616
</li><% if (filters.auth) { %>
17-
<li ng-show="vm.isAdmin()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: vm.isActive('/admin')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="admin"<% } else { %>href="/admin"<% } %>>Admin</a></li><% } %>
17+
<li ng-show="nav.isAdmin()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: nav.isActive('/admin')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="admin"<% } else { %>href="/admin"<% } %>>Admin</a></li><% } %>
1818
</ul><% if (filters.auth) { %>
1919

2020
<ul class="nav navbar-nav navbar-right">
21-
<li ng-hide="vm.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: vm.isActive('/signup')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="signup"<% } else { %>href="/signup"<% } %>>Sign up</a></li>
22-
<li ng-hide="vm.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: vm.isActive('/login')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="login"<% } else { %>href="/login"<% } %>>Login</a></li>
23-
<li ng-show="vm.isLoggedIn()"><p class="navbar-text">Hello {{ vm.getCurrentUser().name }}</p> </li>
24-
<li ng-show="vm.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: vm.isActive('/settings')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="settings"<% } else { %>href="/settings"<% } %>><span class="glyphicon glyphicon-cog"></span></a></li>
25-
<li ng-show="vm.isLoggedIn()"><a <% if (filters.uirouter) { %>ui-sref="logout"<% } else { %>href="/logout"<% } %>>Logout</a></li>
21+
<li ng-hide="nav.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: nav.isActive('/signup')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="signup"<% } else { %>href="/signup"<% } %>>Sign up</a></li>
22+
<li ng-hide="nav.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: nav.isActive('/login')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="login"<% } else { %>href="/login"<% } %>>Login</a></li>
23+
<li ng-show="nav.isLoggedIn()"><p class="navbar-text">Hello {{ nav.getCurrentUser().name }}</p> </li>
24+
<li ng-show="nav.isLoggedIn()" <% if (filters.uirouter) { %>ui-sref-active="active"<% } else { %>ng-class="{active: nav.isActive('/settings')}"<% } %>><a <% if (filters.uirouter) { %>ui-sref="settings"<% } else { %>href="/settings"<% } %>><span class="glyphicon glyphicon-cog"></span></a></li>
25+
<li ng-show="nav.isLoggedIn()"><a <% if (filters.uirouter) { %>ui-sref="logout"<% } else { %>href="/logout"<% } %>>Logout</a></li>
2626
</ul><% } %>
2727
</div>
2828
</div>

Diff for: ‎app/templates/client/components/navbar/navbar(jade).jade

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
div.navbar.navbar-default.navbar-static-top(ng-controller='NavbarController')
22
div.container
33
div.navbar-header
4-
button.navbar-toggle(type='button', ng-click='vm.isCollapsed = !vm.isCollapsed')
4+
button.navbar-toggle(type='button', ng-click='nav.isCollapsed = !nav.isCollapsed')
55
span.sr-only Toggle navigation
66
span.icon-bar
77
span.icon-bar
88
span.icon-bar
99
a.navbar-brand(href='/') <%= lodash.slugify(lodash.humanize(appname)) %>
1010

11-
div#navbar-main.navbar-collapse.collapse(collapse='vm.isCollapsed')
11+
div#navbar-main.navbar-collapse.collapse(collapse='nav.isCollapsed')
1212
ul.nav.navbar-nav
13-
li(ng-repeat='item in vm.menu', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: vm.isActive(item.link)}'<% } %>)
13+
li(ng-repeat='item in nav.menu', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: nav.isActive(item.link)}'<% } %>)
1414
a(<% if (filters.uirouter) { %>ui-sref='{{item.state}}'<% } else { %>ng-href='{{item.link}}'<% } %>) {{item.title}}<% if (filters.auth) { %>
1515

16-
li(ng-show='vm.isAdmin()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: vm.isActive("/admin")}'<% } %>)
16+
li(ng-show='nav.isAdmin()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: nav.isActive("/admin")}'<% } %>)
1717
a(<% if (filters.uirouter) { %>ui-sref='admin'<% } else { %>href='/admin'<% } %>) Admin
1818

1919
ul.nav.navbar-nav.navbar-right
20-
li(ng-hide='vm.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: vm.isActive("/signup")}'<% } %>)
20+
li(ng-hide='nav.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: nav.isActive("/signup")}'<% } %>)
2121
a(<% if (filters.uirouter) { %>ui-sref='signup'<% } else { %>href='/signup'<% } %>) Sign up
2222

23-
li(ng-hide='vm.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: vm.isActive("/login")}'<% } %>)
23+
li(ng-hide='nav.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: nav.isActive("/login")}'<% } %>)
2424
a(<% if (filters.uirouter) { %>ui-sref='login'<% } else { %>href='/login'<% } %>) Login
2525

26-
li(ng-show='vm.isLoggedIn()')
27-
p.navbar-text Hello {{ vm.getCurrentUser().name }}
26+
li(ng-show='nav.isLoggedIn()')
27+
p.navbar-text Hello {{ nav.getCurrentUser().name }}
2828

29-
li(ng-show='vm.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: vm.isActive("/settings")}'<% } %>)
29+
li(ng-show='nav.isLoggedIn()', <% if (filters.uirouter) { %>ui-sref-active='active'<% } else { %>ng-class='{active: nav.isActive("/settings")}'<% } %>)
3030
a(<% if (filters.uirouter) { %>ui-sref='settings'<% } else { %>href='/settings'<% } %>)
3131
span.glyphicon.glyphicon-cog
3232

33-
li(ng-show='vm.isLoggedIn()')
33+
li(ng-show='nav.isLoggedIn()')
3434
a(<% if (filters.uirouter) { %>ui-sref='logout'<% } else { %>href='/logout'<% } %>) Logout<% } %>

Diff for: ‎app/templates/client/components/navbar/navbar.directive.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ angular.module('<%= scriptAppName %>')
55
templateUrl: 'components/navbar/navbar.html',
66
restrict: 'E',
77
controller: 'NavbarController',
8-
controllerAs: 'vm'
8+
controllerAs: 'nav'
99
}));

0 commit comments

Comments
 (0)