Skip to content

Commit b91be63

Browse files
committed
chore(bower): upgrade angular-bootstrap to ~1.1.2
1 parent 24f1fc1 commit b91be63

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Diff for: app/templates/_bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"angular-cookies": "~1.4.0",
1313
"angular-sanitize": "~1.4.0",<% if (filters.ngroute) { %>
1414
"angular-route": "~1.4.0",<% } if (filters.uibootstrap) { %>
15-
"angular-bootstrap": "~0.13.0",<% } %>
15+
"angular-bootstrap": "~1.1.2",<% } %>
1616
"font-awesome": ">=4.1.0",
1717
"lodash": "~2.4.1"<% if(filters.socketio) { %>,
1818
"angular-socket-io": "~0.7.0"<% } if (filters.uirouter) { %>,

Diff for: app/templates/client/components/modal(uibootstrap)/modal.service.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
'use strict';
22

33
angular.module('<%= scriptAppName %>')
4-
.factory('Modal', function($rootScope, $modal) {
4+
.factory('Modal', function($rootScope, $uibModal) {
55
/**
66
* Opens a modal
77
* @param {Object} scope - an object to be merged with modal's scope
88
* @param {String} modalClass - (optional) class(es) to be applied to the modal
9-
* @return {Object} - the instance $modal.open() returns
9+
* @return {Object} - the instance $uibModal.open() returns
1010
*/
1111
function openModal(scope = {}, modalClass = 'modal-default') {
1212
var modalScope = $rootScope.$new();
1313

1414
angular.extend(modalScope, scope);
1515

16-
return $modal.open({
16+
return $uibModal.open({
1717
templateUrl: 'components/modal/modal.html',
1818
windowClass: modalClass,
1919
scope: modalScope

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</button>
1010
<a href="/" class="navbar-brand"><%= lodash.slugify(lodash.humanize(appname)) %></a>
1111
</div>
12-
<div collapse="nav.isCollapsed" class="navbar-collapse collapse" id="navbar-main">
12+
<div uib-collapse="nav.isCollapsed" class="navbar-collapse collapse" id="navbar-main">
1313
<ul class="nav navbar-nav">
1414
<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>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ div.navbar.navbar-default.navbar-static-top(ng-controller='NavbarController')
88
span.icon-bar
99
a.navbar-brand(href='/') <%= lodash.slugify(lodash.humanize(appname)) %>
1010

11-
div#navbar-main.navbar-collapse.collapse(collapse='nav.isCollapsed')
11+
div#navbar-main.navbar-collapse.collapse(uib-collapse='nav.isCollapsed')
1212
ul.nav.navbar-nav
1313
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) { %>

0 commit comments

Comments
 (0)