Skip to content

Commit 456a93b

Browse files
committed
Update to jshint 1.0.0 (grunt-jshint 0.2.0), fix the one error it points at. Small cleanup in Gruntfile.js
1 parent 5e3a24d commit 456a93b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Gruntfile.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = function(grunt) {
44
grunt.initConfig({
55
pkg: grunt.file.readJSON('package.json'),
66
concat: {
7+
// used to copy to dist folder
78
dist: {
89
files: {
910
'dist/jquery.validate.js': ['jquery.validate.js'],
@@ -113,11 +114,13 @@ grunt.initConfig({
113114
}
114115
});
115116

116-
grunt.registerTask('default', ['jshint', 'qunit']);
117-
grunt.registerTask('release', ['default', 'concat', 'uglify', 'zip']);
118117
grunt.loadNpmTasks('grunt-contrib-jshint');
119118
grunt.loadNpmTasks('grunt-contrib-qunit');
120119
grunt.loadNpmTasks('grunt-contrib-uglify');
121120
grunt.loadNpmTasks('grunt-contrib-concat');
122121
grunt.loadNpmTasks('grunt-zipstream');
122+
123+
grunt.registerTask('default', ['jshint', 'qunit']);
124+
grunt.registerTask('release', ['default', 'concat', 'uglify', 'zip']);
125+
123126
};

jquery.validate.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,8 @@ $.format = $.validator.format;
11961196
if ( pendingRequests[port] ) {
11971197
pendingRequests[port].abort();
11981198
}
1199-
return (pendingRequests[port] = ajax.apply(this, arguments));
1199+
pendingRequests[port] = ajax.apply(this, arguments);
1200+
return pendingRequests[port];
12001201
}
12011202
return ajax.apply(this, arguments);
12021203
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"devDependencies": {
3030
"grunt": "0.4.x",
3131
"grunt-contrib-qunit": "~0.1.1",
32-
"grunt-contrib-jshint": "~0.1.1",
32+
"grunt-contrib-jshint": "~0.2.0",
3333
"grunt-contrib-uglify": "~0.1.1",
3434
"grunt-contrib-concat": "~0.1.3",
3535
"grunt-zipstream": "~0.2.2"

0 commit comments

Comments
 (0)