Skip to content

Commit

Permalink
Upgrade angular, lodash, and bootstrap (#227)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Lane authored Dec 14, 2019
1 parent 254ed32 commit 926ad9e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = function (grunt) {
},
scripts: {
src: [
'<%= project.components %>/lodash/index.js',
'<%= project.components %>/lodash/lodash.js',
'<%= project.components %>/jquery/dist/jquery.js',
'<%= project.components %>/angular/angular.js',
'<%= project.components %>/bootstrap/dist/js/bootstrap.js',
Expand Down
2 changes: 1 addition & 1 deletion confidant/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h1>Confidant</h1>

<!-- build:js scripts/scripts.js -->
<!-- injector:js -->
<script src="/components/lodash/index.js"></script>
<script src="/components/lodash/lodash.js"></script>
<script src="/components/jquery/dist/jquery.js"></script>
<script src="/components/angular/angular.js"></script>
<script src="/components/bootstrap/dist/js/bootstrap.js"></script>
Expand Down
9 changes: 8 additions & 1 deletion confidant/public/modules/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,19 @@
.config([
'$httpProvider',
'$compileProvider',
function($httpProvider, $compileProvider) {
'$locationProvider',
function($httpProvider, $compileProvider, $locationProvider) {

// Broadcast events when HTTP requests are made.
$httpProvider.interceptors.push('common.HttpEventInterceptor');

$compileProvider.debugInfoEnabled(false);

// the location hashprefix was changed from '' to '!' in angular 1.6. Set it back for compat.
$locationProvider.hashPrefix('');

// lowercase was removed, but there's a $$lowercase function we can use for backwards compat.
angular.lowercase = angular.$$lowercase;
}])

;
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
"url": "git://github.com/lyft/confidant.git"
},
"dependencies": {
"@uirouter/angularjs": "~0.2.15",
"angular": "~1.3.20",
"bootstrap": "3.3.4",
"angular-resource": "~1.3.20",
"angular-cookies": "~1.3.20",
"angular-sanitize": "~1.3.20",
"angular-animate": "~1.3.20",
"angular-route": "~1.3.20",
"angular-touch": "~1.3.20",
"@uirouter/angularjs": "~1.0.23",
"angular": "~1.7.9",
"angular-animate": "~1.7.9",
"angular-cookies": "~1.7.9",
"angular-resource": "~1.7.9",
"angular-route": "~1.7.9",
"angular-sanitize": "~1.7.9",
"angular-touch": "~1.7.9",
"angular-ui-bootstrap": "~0.14.2",
"angular-xeditable": "~0.1.9",
"bootstrap": "3.4.1",
"es5-shim": "~4.1.13",
"json3": "~3.3.2",
"lodash": "~3.10.1",
"lodash": "~4.17.15",
"spin.js": "~2.3.2"
},
"devDependencies": {
Expand Down

0 comments on commit 926ad9e

Please sign in to comment.