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

Commit 7d0c6f5

Browse files
committed
feat(v2): Bump versions of Jquery and fullcalendar, fix tests path
1 parent c0e5d54 commit 7d0c6f5

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

bower.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@
1818
"dependencies": {
1919
"angular": "~1.2.x",
2020
"moment": "2.5.1",
21-
"jquery": "~1.10.2",
21+
"jquery": "~2.x",
2222
"jquery-ui": "~1.10.3",
23-
"fullcalendar": "~1.x"
23+
"fullcalendar": "~2.x"
2424
},
2525
"devDependencies": {
2626
"angular-mocks": "~1.x",
2727
"bootstrap-css": "2.3.1"
28-
},
29-
"resolutions": {
30-
"jquery": "~2.x"
3128
}
3229
}

test/test.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function (config) {
88
'bower_components/angular/angular.js',
99
'bower_components/angular-mocks/angular-mocks.js',
1010
'bower_components/moment/moment.js',
11-
'bower_components/fullcalendar/fullcalendar.js',
11+
'bower_components/fullcalendar/dist/fullcalendar.js',
1212
'src/calendar.js',
1313
'test/*.spec.js'
1414
],

0 commit comments

Comments
 (0)