Skip to content

Commit a70230c

Browse files
committed
Updated dependencies and removed karma-jasmine-jquery
1 parent 5f0fac7 commit a70230c

File tree

4 files changed

+862
-12
lines changed

4 files changed

+862
-12
lines changed

.gitattributes

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
1+
# Enforce Unix newlines
2+
*.css text eol=lf
3+
*.html text eol=lf
4+
*.js text eol=lf
5+
*.json text eol=lf
6+
*.md text eol=lf
7+
*.py text eol=lf
8+
*.rb text eol=lf
9+
*.scss text eol=lf
10+
*.svg text eol=lf
11+
*.yml text eol=lf
12+
13+
# Don't diff or textually merge source maps
14+
*.map binary
315

416
# Custom for Visual Studio
517
*.cs diff=csharp

karma.conf.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = function(config) {
1111

1212
// frameworks to use
1313
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
14-
frameworks: ['jasmine-jquery', 'jasmine'],
14+
frameworks: ['jasmine'],
1515

1616

1717
// list of files / patterns to load in the browser
@@ -64,8 +64,7 @@ module.exports = function(config) {
6464
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
6565
browsers: [
6666
'PhantomJS',
67-
// 'Chrome',
68-
// 'Firefox'
67+
// 'Chrome'
6968
],
7069

7170

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,27 @@
3232
},
3333
"devDependencies": {
3434
"codecov": "^1.0.1",
35-
"eslint": "^2.13.1",
35+
"eslint": "^3.5.0",
3636
"gulp": "^3.9.1",
3737
"gulp-autoprefixer": "^3.1.0",
3838
"gulp-bump": "^2.2.0",
39-
"gulp-connect": "^4.1.0",
39+
"gulp-connect": "^5.0.0",
4040
"gulp-csscomb": "^3.0.7",
41-
"gulp-eslint": "^2.0.0",
41+
"gulp-eslint": "^3.0.1",
4242
"gulp-gh-pages": "^0.5.4",
4343
"gulp-header": "^1.8.7",
4444
"gulp-load-plugins": "^1.2.4",
4545
"gulp-rename": "^1.2.2",
4646
"gulp-sass": "^2.3.2",
47-
"gulp-uglify": "^1.5.4",
47+
"gulp-uglify": "^2.0.0",
4848
"gulp-util": "^3.0.7",
4949
"gulp-zip": "^3.2.0",
5050
"istanbul": "^0.4.4",
5151
"jasmine-core": "^2.4.1",
5252
"karma": "^1.1.0",
53-
"karma-chrome-launcher": "^1.0.1",
53+
"karma-chrome-launcher": "^2.0.0",
5454
"karma-coverage": "^1.0.0",
55-
"karma-firefox-launcher": "^1.0.0",
5655
"karma-jasmine": "^1.0.2",
57-
"karma-jasmine-jquery": "^0.1.1",
5856
"karma-mocha-reporter": "^2.0.4",
5957
"karma-phantomjs-launcher": "^1.0.1",
6058
"phantomjs-prebuilt": "^2.1.7"

0 commit comments

Comments
 (0)