Skip to content

Commit 97e3ca7

Browse files
mchapmanmchapman
committed
Get current version of ui-bootstrap
1 parent 4440731 commit 97e3ca7

File tree

9 files changed

+18
-38
lines changed

9 files changed

+18
-38
lines changed

‎app/demo/demo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ myDemoApp.config(['formRoutesProvider', function (formRoutes) {
2323

2424
formsAngular.config(['urlServiceProvider', 'cssFrameworkServiceProvider', function (urlService, cssFrameworkService) {
2525
urlService.setOptions({html5Mode: false, hashPrefix: '!'});
26-
cssFrameworkService.setOptions({framework: 'bs3'}); // Unit and e2e tests depend on this being bs2
26+
cssFrameworkService.setOptions({framework: 'bs2'}); // Unit and e2e tests depend on this being bs2
2727
}]);

‎app/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link rel="stylesheet" href="/bower_components/jquery-ui/themes/smoothness/jquery-ui.css">
1515
<link rel="stylesheet" href="/bower_components/select2/select2.css">
1616
<link rel="stylesheet" href="/bower_components/ng-grid/ng-grid.css">
17-
<link rel="stylesheet" href="/demo/css/demo-bs3.css">
17+
<link rel="stylesheet" href="/demo/css/demo-bs2.css">
1818
<!-- endbuild -->
1919
</head>
2020
<body ng-app="myDemoApp" ng-controller="NavCtrl" ng-keyup="globalShortcuts($event)">
@@ -84,7 +84,7 @@
8484
<script type="text/javascript" src="/bower_components/angular-route/angular-route.js"></script>
8585
<script type="text/javascript" src="/bower_components/angular-sanitize/angular-sanitize.js"></script>
8686
<script type="text/javascript" src="/bower_components/underscore/underscore.js"></script>
87-
<script type="text/javascript" src="/bower_components/angular-ui-bootstrap/ui-bootstrap-tpls.js"></script>
87+
<script type="text/javascript" src="/bower_components/angular-ui-bootstrap-bower/ui-bootstrap-tpls.js"></script>
8888
<script type="text/javascript" src="/bower_components/angular-ui-date/src/date.js"></script>
8989
<script type="text/javascript" src="/bower_components/angular-ui-select2/src/select2.js"></script>
9090
<script type="text/javascript" src="/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>

‎app/js/controllers/analysis.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

3-
formsAngular.controller('AnalysisCtrl', ['$locationParse', '$filter', '$scope', '$http', '$location', '$routeParams', 'urlService', function ($locationParse, $filter, $scope, $http, $location, $routeParams, urlService) {
3+
formsAngular.controller('AnalysisCtrl', ['$locationParse', '$filter', '$scope', '$http', '$location', '$routeParams', 'urlService',
4+
function ($locationParse, $filter, $scope, $http, $location, $routeParams, urlService) {
45
/*jshint newcap: false */
56
var firstTime = true,
67
pdfPlugIn = new ngGridPdfExportPlugin({inhibitButton: true}),

‎app/partials/get-started/index.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
<script type="text/javascript" src="/bower_components/angular-route/angular-route.js"></script>
1313
<script type="text/javascript" src="/bower_components/angular-sanitize/angular-sanitize.js"></script>
1414
<script type="text/javascript" src="/bower_components/underscore/underscore.js"></script>
15-
16-
<!-- The next line is for bootstrap 2 -->
1715
<script type="text/javascript" src="/bower_components/angular-ui-bootstrap-bower/ui-bootstrap-tpls.js"></script>
18-
<!-- The next line is for bootstrap 3 -->
19-
<script type="text/javascript" src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
20-
2116
<script type="text/javascript" src="/bower_components/angular-ui-date/src/date.js"></script>
2217
<script type="text/javascript" src="/bower_components/angular-ui-select2/src/select2.js"></script>
2318
<script type="text/javascript" src="/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>

‎dist/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
display: none !important;
1111
}</style>
1212

13-
<link rel="stylesheet" href="styles/295f7ff2.main.css"/>
13+
<link rel="stylesheet" href="styles/8d1f9cd6.main.css"/>
1414
</head>
1515
<body ng-app="myDemoApp" ng-controller="NavCtrl" ng-keyup="globalShortcuts($event)">
1616
<div class="visible-lg visible-desktop">
@@ -88,7 +88,7 @@
8888
<script src="scripts/c7901979.lib.js"></script>
8989

9090
<!--Demo application stuff-->
91-
<script src="scripts/c34a3ff9.app.js"></script>
91+
<script src="scripts/989254d0.app.js"></script>
9292

9393
<script type="text/javascript">
9494
if (window.location.hostname != '0.0.0.0') {

‎dist/scripts/c34a3ff9.app.js renamed to ‎dist/scripts/989254d0.app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)