Skip to content
This repository was archived by the owner on Oct 5, 2020. It is now read-only.

Commit 53306ea

Browse files
grtjngrtjn
committed
Merge pull request #321 from Audarth/master
Fixes #319 - Angular bootstrap directive changes
2 parents 729a424 + 6a8f7dc commit 53306ea

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

‎app/templates/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"dependencies": {
55
"angular": "~1.4.4",
6-
"angular-bootstrap": "~0.13.3",
6+
"angular-bootstrap": "~0.14.0",
77
"angular-cookies": "~1.4.4",
88
"angular-highlightjs": "~0.4.3",
99
"angular-mocks": "~1.4.4",

‎app/templates/ui/app/detail/detail.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<div class="row detail">
22
<div class="col-sm-8">
3-
<tabset type="pills">
4-
<tab active="true">
5-
<tab-heading>{{ctrl.type | uppercase}}</tab-heading>
3+
<uib-tabset type="pills">
4+
<uib-tab active="true">
5+
<uib-tab-heading>{{ctrl.type | uppercase}}</uib-tab-heading>
66
<div class="col-sm-9">
77
<json-explorer ng-if="ctrl.type==='json'" data="ctrl.json"></json-explorer>
88
<pre ng-if="ctrl.type!=='json'" class="pre-xml">{{ctrl.xml}}</pre>
99

1010
<a ng-if="ctrl.type==='binary'" target="_blank" ng-href="/v1/documents?uri={{ctrl.uri}}&transform=download" class="btn btn-default">Download</a>
1111

1212
</div>
13-
</tab>
14-
<tab ng-if="ctrl.type!=='json'">
15-
<tab-heading>JSON</tab-heading>
13+
</uib-tab>
14+
<uib-tab ng-if="ctrl.type!=='json'">
15+
<uib-tab-heading>JSON</uib-tab-heading>
1616
<div class="col-sm-9">
1717
<json-explorer data="ctrl.json"></json-explorer>
1818
</div>
19-
</tab>
20-
<tab ng-if="ctrl.type==='json'">
21-
<tab-heading >XML</tab-heading>
19+
</uib-tab>
20+
<uib-tab ng-if="ctrl.type==='json'">
21+
<uib-tab-heading >XML</uib-tab-heading>
2222
<div class="col-sm-9">
2323
<pre class="pre-xml">{{ctrl.xml}}</pre>
2424
</div>
25-
</tab>
26-
</tabset>
25+
</uib-tab>
26+
</uib-tabset>
2727
</div>
2828
<div class="col-sm-4">
2929
<!-- show (links to) similar documents -->

‎app/templates/ui/app/login/login.service.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
angular.module('app.login')
55
.factory('loginService', LoginService);
66

7-
LoginService.$inject = ['$http', '$modal', '$q', '$rootScope', '$state',
7+
LoginService.$inject = ['$http', '$uibModal', '$q', '$rootScope', '$state',
88
'$stateParams', 'messageBoardService'];
9-
function LoginService($http, $modal, $q, $rootScope, $state, $stateParams, messageBoardService) {
9+
function LoginService($http, $uibModal, $q, $rootScope, $state, $stateParams, messageBoardService) {
1010
var _loginMode = 'full'; // 'modal', 'top-right', or 'full'
1111
var _loginError;
1212
var _toStateName;
@@ -68,8 +68,8 @@
6868
function loginPrompt() {
6969
var d = $q.defer();
7070
if (_loginMode === 'modal') {
71-
$modal.open({
72-
controller: ['$modalInstance', function($modalInstance) {
71+
$uibModal.open({
72+
controller: ['$uibModalInstance', function($uibModalInstance) {
7373
var ctrl = this;
7474
ctrl.showCancel = $state.current.name !== 'root.landing';
7575
ctrl.close = function(user) {
@@ -79,7 +79,7 @@
7979
d.reject();
8080
$state.go('root.landing');
8181
}
82-
return $modalInstance.close();
82+
return $uibModalInstance.close();
8383
};
8484
}],
8585
controllerAs: 'ctrl',

‎app/templates/ui/app/login/login.service.spec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
beforeEach(function() {
1717
bard.appModule('app.login');
18-
bard.inject('$q', '$http', '$modal', '$rootScope', '$state', '$stateParams');
18+
bard.inject('$q', '$http', '$uibModal', '$rootScope', '$state', '$stateParams');
1919

2020
bard.mockService($http, {
2121
_default: $q.when([]),
@@ -30,7 +30,7 @@
3030
}
3131
});
3232

33-
bard.mockService($modal, {
33+
bard.mockService($uibModal, {
3434
open: function() {
3535
modalOpened = true;
3636
return { result: angular.noop };
@@ -81,7 +81,7 @@
8181

8282
beforeEach(function() {
8383
bard.appModule('app.login');
84-
bard.inject('$q', '$http', '$modal', '$rootScope', '$state', '$stateParams');
84+
bard.inject('$q', '$http', '$uibModal', '$rootScope', '$state', '$stateParams');
8585

8686
bard.mockService($http, {
8787
_default: $q.when([]),
@@ -96,7 +96,7 @@
9696
}
9797
});
9898

99-
bard.mockService($modal, {
99+
bard.mockService($uibModal, {
100100
open: function() {
101101
modalOpened = true;
102102
return { result: angular.noop };

‎app/templates/ui/app/search/search.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ <h4 ng-if="ctrl.response.total === 0">No results to show</h4>
1313

1414
<div ng-if="ctrl.response.total > 0" class="results">
1515
<div class="pagination-ctrls">
16-
<pagination class="pagination pagination-sm" ng-model="ctrl.page" ng-change="ctrl.search()" max-size="10" boundary-links="true" total-items="ctrl.response.total" items-per-page="ctrl.response['page-length']">
17-
</pagination>
16+
<uib-pagination class="pagination-sm" ng-model="ctrl.page" ng-change="ctrl.search()" max-size="10" boundary-links="true" total-items="ctrl.response.total" items-per-page="ctrl.response['page-length']">
17+
</uib-pagination>
1818
<ml-snippet set-snippet="ctrl.setSnippet(type)"></ml-snippet>
1919
</div>
2020
<ml-metrics search="ctrl.response" ></ml-metrics>

‎app/templates/ui/app/search/snippet.directive.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
controllerAs: 'ctrl',
1414
replace: true,
1515
scope: {
16-
snippetType: '=',
1716
setSnippet: '&'
1817
},
1918
templateUrl: 'app/search/snippet.html'

‎app/templates/ui/app/search/snippet.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<div class="btn-group" dropdown>
2-
<button id="single-button" type="button" class="btn btn-sm btn-default" dropdown-toggle>
1+
<div class="btn-group" uib-dropdown>
2+
<button id="single-button" type="button" class="btn btn-sm btn-default" uib-dropdown-toggle>
33
Snippet Size: <i>{{snippetType || 'compact'}}</i> <span class="caret"></span>
44
</button>
5-
<ul class="dropdown-menu" role="menu" aria-labelledby="single-button">
5+
<ul class="uib-dropdown-menu" role="menu" aria-labelledby="single-button">
66
<li role="menuitem" ng-repeat="snippet in snippets">
77
<a href ng-click="ctrl.setSnippetType(snippet)">{{snippet}}</a>
88
</li>

0 commit comments

Comments
 (0)