Skip to content

Commit d67522e

Browse files
mikesherovgnarf
authored andcommitted
Build: Upgrade to the latest Grunt and JSHint - Closes jquerygh-786
1 parent 9b90887 commit d67522e

File tree

12 files changed

+68
-75
lines changed

12 files changed

+68
-75
lines changed

.jshintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
"eqnull": true,
44
"eqeqeq": true,
55
"expr": true,
6-
"latedef": true,
76
"noarg": true,
7+
"node": true,
88
"onevar": true,
9-
"smarttabs": true,
109
"trailing": true,
1110
"undef": true
1211
}

build/.jshintrc

Lines changed: 0 additions & 13 deletions
This file was deleted.

build/release/release.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env node
22
/*global cat:true cd:true cp:true echo:true exec:true exit:true ls:true*/
33

4+
"use strict";
5+
46
var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime,
57
fs = require( "fs" ),
68
path = require( "path" ),

build/tasks/build.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
module.exports = function( grunt ) {
22

3-
var path = require( "path" );
3+
"use strict";
4+
5+
var path = require( "path" ),
6+
fs = require( "fs" );
47

58
grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() {
69
var pkg = grunt.config( "pkg" ),

build/tasks/testswarm.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/*jshint node: true */
21
module.exports = function( grunt ) {
32

3+
"use strict";
4+
45
var versions = {
56
"git": "git",
67
"1.8": "1.8.0 1.8.1 1.8.2",

grunt.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/*jshint node: true */
21
module.exports = function( grunt ) {
32

3+
"use strict";
4+
45
var
56
// files
67
coreFiles = [
@@ -326,9 +327,7 @@ grunt.initConfig({
326327
}
327328

328329
return {
329-
// TODO: use "faux strict mode" https://github.com/jshint/jshint/issues/504
330-
// TODO: limit `smarttabs` to multi-line comments https://github.com/jshint/jshint/issues/503
331-
options: parserc(),
330+
grunt: parserc(),
332331
ui: parserc( "ui/" ),
333332
// TODO: `evil: true` is only for document.write() https://github.com/jshint/jshint/issues/519
334333
// TODO: don't create so many globals in tests

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
],
4949
"dependencies": {},
5050
"devDependencies": {
51-
"grunt": "~0.3.9",
51+
"grunt": "~0.3.17",
5252
"grunt-css": "0.2.0",
5353
"grunt-compare-size": "0.1.4",
5454
"grunt-html": "0.1.1",

tests/.jshintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"latedef": true,
1010
"noarg": true,
1111
"onevar": true,
12-
"smarttabs": true,
1312
"trailing": true,
1413
"undef": true,
1514
"predef": [

tests/unit/datepicker/datepicker_tickets.js

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module("datepicker: tickets");
77

88
// http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
99
test('beforeShowDay-getDate', function() {
10-
expect( 3 );
10+
expect( 3 );
1111
var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
12-
dp = $('#ui-datepicker-div');
12+
dp = $('#ui-datepicker-div');
1313
inp.val('01/01/2010').datepicker('show');
1414
// contains non-breaking space
1515
equal($('div.ui-datepicker-title').text(), 'January 2010', 'Initial month');
@@ -26,63 +26,63 @@ test('beforeShowDay-getDate', function() {
2626
});
2727

2828
test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler', function(){
29-
expect( 3 );
30-
var inp = init('#inp',{
31-
beforeShow: function(){
32-
return false;
33-
}
34-
}),
35-
dp = $('#ui-datepicker-div');
36-
inp.datepicker('show');
37-
equal(dp.css('display'), 'none',"beforeShow returns false");
38-
inp.datepicker('destroy');
29+
expect( 3 );
30+
var inp = init('#inp',{
31+
beforeShow: function(){
32+
return false;
33+
}
34+
}),
35+
dp = $('#ui-datepicker-div');
36+
inp.datepicker('show');
37+
equal(dp.css('display'), 'none',"beforeShow returns false");
38+
inp.datepicker('destroy');
3939

40-
inp = init('#inp',{
41-
beforeShow: function(){
42-
}
43-
});
44-
dp = $('#ui-datepicker-div');
45-
inp.datepicker('show');
46-
equal(dp.css('display'), 'block',"beforeShow returns nothing");
40+
inp = init('#inp',{
41+
beforeShow: function(){
42+
}
43+
});
44+
dp = $('#ui-datepicker-div');
45+
inp.datepicker('show');
46+
equal(dp.css('display'), 'block',"beforeShow returns nothing");
4747
inp.datepicker('hide');
48-
inp.datepicker('destroy');
48+
inp.datepicker('destroy');
4949

50-
inp = init('#inp',{
51-
beforeShow: function(){
52-
return true;
53-
}
54-
});
55-
dp = $('#ui-datepicker-div');
56-
inp.datepicker('show');
57-
equal(dp.css('display'), 'block',"beforeShow returns true");
50+
inp = init('#inp',{
51+
beforeShow: function(){
52+
return true;
53+
}
54+
});
55+
dp = $('#ui-datepicker-div');
56+
inp.datepicker('show');
57+
equal(dp.css('display'), 'block',"beforeShow returns true");
5858
inp.datepicker('hide');
59-
inp.datepicker('destroy');
59+
inp.datepicker('destroy');
6060
});
6161

6262
test('Ticket 6827: formatDate day of year calculation is wrong during day lights savings time', function(){
63-
expect( 1 );
64-
var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
65-
equal(time, "089");
63+
expect( 1 );
64+
var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
65+
equal(time, "089");
6666
});
6767

6868
test('Ticket #7244: date parser does not fail when too many numbers are passed into the date function', function() {
69-
expect( 4 );
70-
var date;
71-
try{
72-
date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
73-
ok(false, "Did not properly detect an invalid date");
74-
}catch(e){
75-
ok("invalid date detected");
76-
}
69+
expect( 4 );
70+
var date;
71+
try{
72+
date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
73+
ok(false, "Did not properly detect an invalid date");
74+
}catch(e){
75+
ok("invalid date detected");
76+
}
7777

78-
try {
79-
date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
80-
equal(date.getDate(), 18);
81-
equal(date.getMonth(), 3);
82-
equal(date.getFullYear(), 1988);
83-
} catch(e) {
84-
ok(false, "Did not properly parse date with extra text separated by whitespace");
85-
}
78+
try {
79+
date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
80+
equal(date.getDate(), 18);
81+
equal(date.getMonth(), 3);
82+
equal(date.getFullYear(), 1988);
83+
} catch(e) {
84+
ok(false, "Did not properly parse date with extra text separated by whitespace");
85+
}
8686
});
8787

8888
})(jQuery);

tests/unit/testsuite.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ function includeScript( url ) {
1212
document.write( "<script src='../../../" + url + "'></script>" );
1313
}
1414

15+
function url( value ) {
16+
return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random() * 100000, 10);
17+
}
18+
1519
reset = QUnit.reset;
1620
QUnit.reset = function() {
1721
// Ensure jQuery events and data on the fixture are properly removed
@@ -65,11 +69,11 @@ TestHelpers.testJshint = function( module ) {
6569

6670
$.when(
6771
$.ajax({
68-
url: "../../../ui/.jshintrc",
72+
url: url("../../../ui/.jshintrc"),
6973
dataType: "json"
7074
}),
7175
$.ajax({
72-
url: "../../../ui/jquery.ui." + module + ".js",
76+
url: url("../../../ui/jquery.ui." + module + ".js"),
7377
dataType: "text"
7478
})
7579
).done(function( hintArgs, srcArgs ) {

ui/.jshintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"latedef": true,
99
"noarg": true,
1010
"onevar": true,
11-
"smarttabs": true,
1211
"trailing": true,
1312
"undef": true,
1413
"predef": [

ui/jquery.ui.autocomplete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ $.widget( "ui.autocomplete", {
292292
.insertAfter( this.element );
293293

294294
if ( $.fn.bgiframe ) {
295-
this.menu.element.bgiframe();
295+
this.menu.element.bgiframe();
296296
}
297297

298298
// turning off autocomplete prevents the browser from remembering the

0 commit comments

Comments
 (0)