Skip to content

No ticket: upgrade to the latest Grunt and JSHint #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
"eqnull": true,
"eqeqeq": true,
"expr": true,
"latedef": true,
"noarg": true,
"node": true,
"onevar": true,
"smarttabs": true,
"trailing": true,
"undef": true
}
13 changes: 0 additions & 13 deletions build/.jshintrc

This file was deleted.

2 changes: 2 additions & 0 deletions build/release/release.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env node
/*global cat:true cd:true cp:true echo:true exec:true exit:true ls:true*/

"use strict";

var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime,
fs = require( "fs" ),
path = require( "path" ),
Expand Down
5 changes: 4 additions & 1 deletion build/tasks/build.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
module.exports = function( grunt ) {

var path = require( "path" );
"use strict";

var path = require( "path" ),
fs = require( "fs" );

grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() {
var pkg = grunt.config( "pkg" ),
Expand Down
3 changes: 2 additions & 1 deletion build/tasks/testswarm.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*jshint node: true */
module.exports = function( grunt ) {

"use strict";

var versions = {
"git": "git",
"1.8": "1.8.0 1.8.1 1.8.2",
Expand Down
7 changes: 3 additions & 4 deletions grunt.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*jshint node: true */
module.exports = function( grunt ) {

"use strict";

var
// files
coreFiles = [
Expand Down Expand Up @@ -326,9 +327,7 @@ grunt.initConfig({
}

return {
// TODO: use "faux strict mode" https://github.com/jshint/jshint/issues/504
// TODO: limit `smarttabs` to multi-line comments https://github.com/jshint/jshint/issues/503
options: parserc(),
grunt: parserc(),
ui: parserc( "ui/" ),
// TODO: `evil: true` is only for document.write() https://github.com/jshint/jshint/issues/519
// TODO: don't create so many globals in tests
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
],
"dependencies": {},
"devDependencies": {
"grunt": "~0.3.9",
"grunt": "~0.3.17",
"grunt-css": "0.2.0",
"grunt-compare-size": "0.1.4",
"grunt-html": "0.1.1",
Expand Down
1 change: 0 additions & 1 deletion tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"latedef": true,
"noarg": true,
"onevar": true,
"smarttabs": true,
"trailing": true,
"undef": true,
"predef": [
Expand Down
96 changes: 48 additions & 48 deletions tests/unit/datepicker/datepicker_tickets.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module("datepicker: tickets");

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

test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler', function(){
expect( 3 );
var inp = init('#inp',{
beforeShow: function(){
return false;
}
}),
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'none',"beforeShow returns false");
inp.datepicker('destroy');
expect( 3 );
var inp = init('#inp',{
beforeShow: function(){
return false;
}
}),
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'none',"beforeShow returns false");
inp.datepicker('destroy');

inp = init('#inp',{
beforeShow: function(){
}
});
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'block',"beforeShow returns nothing");
inp = init('#inp',{
beforeShow: function(){
}
});
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'block',"beforeShow returns nothing");
inp.datepicker('hide');
inp.datepicker('destroy');
inp.datepicker('destroy');

inp = init('#inp',{
beforeShow: function(){
return true;
}
});
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'block',"beforeShow returns true");
inp = init('#inp',{
beforeShow: function(){
return true;
}
});
dp = $('#ui-datepicker-div');
inp.datepicker('show');
equal(dp.css('display'), 'block',"beforeShow returns true");
inp.datepicker('hide');
inp.datepicker('destroy');
inp.datepicker('destroy');
});

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

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

try {
date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
equal(date.getDate(), 18);
equal(date.getMonth(), 3);
equal(date.getFullYear(), 1988);
} catch(e) {
ok(false, "Did not properly parse date with extra text separated by whitespace");
}
try {
date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
equal(date.getDate(), 18);
equal(date.getMonth(), 3);
equal(date.getFullYear(), 1988);
} catch(e) {
ok(false, "Did not properly parse date with extra text separated by whitespace");
}
});

})(jQuery);
8 changes: 6 additions & 2 deletions tests/unit/testsuite.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ function includeScript( url ) {
document.write( "<script src='../../../" + url + "'></script>" );
}

function url( value ) {
return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random() * 100000, 10);
}

reset = QUnit.reset;
QUnit.reset = function() {
// Ensure jQuery events and data on the fixture are properly removed
Expand Down Expand Up @@ -65,11 +69,11 @@ TestHelpers.testJshint = function( module ) {

$.when(
$.ajax({
url: "../../../ui/.jshintrc",
url: url("../../../ui/.jshintrc"),
dataType: "json"
}),
$.ajax({
url: "../../../ui/jquery.ui." + module + ".js",
url: url("../../../ui/jquery.ui." + module + ".js"),
dataType: "text"
})
).done(function( hintArgs, srcArgs ) {
Expand Down
1 change: 0 additions & 1 deletion ui/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"latedef": true,
"noarg": true,
"onevar": true,
"smarttabs": true,
"trailing": true,
"undef": true,
"predef": [
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ $.widget( "ui.autocomplete", {
.insertAfter( this.element );

if ( $.fn.bgiframe ) {
this.menu.element.bgiframe();
this.menu.element.bgiframe();
}

// turning off autocomplete prevents the browser from remembering the
Expand Down