Skip to content

Commit

Permalink
Build: Enable "unused" option in jshint - Remove unused variables fro…
Browse files Browse the repository at this point in the history
…m codebase. - Closes gh-788

Squashed commit of the following:

commit 7f19f92
Author: Mike Sherov <mike.sherov@gmail.com>
Date:   Tue Oct 23 10:34:28 2012 -0400

    put back in fake args for signatures that we want to keep

commit 257505a
Author: Mike Sherov <mike.sherov@gmail.com>
Date:   Tue Oct 23 08:10:20 2012 -0400

    changes per @scott_gonzalez

commit 1272548
Author: Mike Sherov <mike.sherov@gmail.com>
Date:   Mon Oct 22 22:54:05 2012 -0400

    clean up unused vars in ui directory

commit 563595e
Author: Mike Sherov <mike.sherov@gmail.com>
Date:   Mon Oct 22 22:37:42 2012 -0400

    clean up unused vars in grunt and tests
  • Loading branch information
mikesherov authored and gnarf committed Oct 23, 2012
1 parent 7af1ec7 commit e123099
Show file tree
Hide file tree
Showing 56 changed files with 282 additions and 311 deletions.
3 changes: 2 additions & 1 deletion .jshintrc
Expand Up @@ -7,5 +7,6 @@
"node": true,
"onevar": true,
"trailing": true,
"undef": true
"undef": true,
"unused": true
}
2 changes: 1 addition & 1 deletion build/release/release.js
Expand Up @@ -425,7 +425,7 @@ function abort( msg ) {
function walk( methods ) {
var method = methods.shift();

function next( error ) {
function next() {
if ( methods.length ) {
walk( methods );
}
Expand Down
2 changes: 1 addition & 1 deletion build/tasks/build.js
Expand Up @@ -146,7 +146,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
opts: {
cwd: 'dist'
}
}, function( err, result ) {
}, function( err ) {
if ( err ) {
grunt.log.error( err );
done();
Expand Down
12 changes: 1 addition & 11 deletions tests/.jshintrc
Expand Up @@ -11,8 +11,8 @@
"onevar": true,
"trailing": true,
"undef": true,
"unused": true,
"predef": [
"addMonths",
"asyncTest",
"container",
"deepEqual",
Expand All @@ -29,24 +29,14 @@
"Globalize",
"heightAfter",
"init",
"isNotOpen",
"isOpen",
"modal",
"module",
"moved",
"notEqual",
"offsetAfter",
"offsetBefore",
"ok",
"PROP_NAME",
"QUnit",
"restoreScroll",
"shouldBeDroppable",
"shouldmove",
"shouldNotBeDroppable",
"shouldnotmove",
"shouldnotresize",
"shouldresize",
"start",
"strictEqual",
"stop",
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/autocomplete/autocomplete_core.js
Expand Up @@ -109,8 +109,7 @@ test( "allow form submit on enter when menu is not active", function() {
function arrowsMoveFocus( id, isKeyUp ) {
expect( 1 );

var didMove = false,
element = $( id ).autocomplete({
var element = $( id ).autocomplete({
source: [ "a" ],
delay: 0,
minLength: 0
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/autocomplete/autocomplete_events.js
Expand Up @@ -39,7 +39,7 @@ $.each([
], "response ui.content" );
ui.content.splice( 0, 1 );
},
open: function( event ) {
open: function() {
ok( menu.is( ":visible" ), "menu open on open" );
},
focus: function( event, ui ) {
Expand Down Expand Up @@ -127,7 +127,7 @@ asyncTest( "cancel focus", function() {
element = $( "#autocomplete" ).autocomplete({
delay: 0,
source: data,
focus: function( event, ui ) {
focus: function() {
$( this ).val( customVal );
return false;
}
Expand All @@ -146,7 +146,7 @@ asyncTest( "cancel select", function() {
element = $( "#autocomplete" ).autocomplete({
delay: 0,
source: data,
select: function( event, ui ) {
select: function() {
$( this ).val( customVal );
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/autocomplete/autocomplete_options.js
Expand Up @@ -33,7 +33,7 @@ function autoFocusTest( afValue, focusedLength ) {
autoFocus: afValue,
delay: 0,
source: data,
open: function( event, ui ) {
open: function() {
equal( element.autocomplete( "widget" ).children( ".ui-menu-item:first" ).find( ".ui-state-focus" ).length,
focusedLength, "first item is " + (afValue ? "" : "not") + " auto focused" );
start();
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/button/button_events.js
@@ -1,7 +1,7 @@
/*
* button_events.js
*/
(function($) {
(function() {

module("button: events");

Expand Down
18 changes: 3 additions & 15 deletions tests/unit/datepicker/datepicker_core.js
Expand Up @@ -12,31 +12,19 @@ function equalsDate(d1, d2, message) {
equal(d1.toString(), d2.toString(), message);
}

function equalsDateArray(a1, a2, message) {
if (!a1 || !a2) {
ok(false, message + ' - missing dates');
return;
}
a1[0] = (a1[0] ? new Date(a1[0].getFullYear(), a1[0].getMonth(), a1[0].getDate()) : '');
a1[1] = (a1[1] ? new Date(a1[1].getFullYear(), a1[1].getMonth(), a1[1].getDate()) : '');
a2[0] = (a2[0] ? new Date(a2[0].getFullYear(), a2[0].getMonth(), a2[0].getDate()) : '');
a2[1] = (a2[1] ? new Date(a2[1].getFullYear(), a2[1].getMonth(), a2[1].getDate()) : '');
deepEqual(a1, a2, message);
}

function addMonths(date, offset) {
TestHelpers.addMonths = function(date, offset) {
var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
date.setDate(Math.min(date.getDate(), maxDay));
date.setMonth(date.getMonth() + offset);
return date;
}
};

function init(id, options) {
$.datepicker.setDefaults($.datepicker.regional['']);
return $(id).datepicker($.extend({showAnim: ''}, options || {}));
}

var PROP_NAME = 'datepicker';
TestHelpers.PROP_NAME = 'datepicker';

(function($) {

Expand Down
4 changes: 3 additions & 1 deletion tests/unit/datepicker/datepicker_defaults.js
Expand Up @@ -2,8 +2,10 @@
* datepicker_defaults.js
*/

/*
var datepicker_defaults = {
disabled: false
};
//TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
*/
6 changes: 3 additions & 3 deletions tests/unit/datepicker/datepicker_events.js
Expand Up @@ -30,7 +30,7 @@ test('events', function() {
inp.val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
equal(selectedThis, inp[0], 'Callback selected this');
equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback selected inst');
equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback selected inst');
equal(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
'Callback selected date');
inp.val('').datepicker('show').
Expand Down Expand Up @@ -59,7 +59,7 @@ test('events', function() {
inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_UP});
date.setMonth(date.getMonth() - 1);
equal(selectedThis, inp[0], 'Callback change month/year this');
equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback change month/year inst');
equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback change month/year inst');
equal(selectedDate, newMonthYear(date),
'Callback change month/year date - pgup');
inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_DOWN});
Expand Down Expand Up @@ -107,7 +107,7 @@ test('events', function() {
val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
equal(selectedThis, inp[0], 'Callback close this');
equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback close inst');
equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback close inst');
equal(selectedDate, '', 'Callback close date - esc');
inp.val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
Expand Down
20 changes: 10 additions & 10 deletions tests/unit/datepicker/datepicker_methods.js
Expand Up @@ -10,56 +10,56 @@ test('destroy', function() {
var inl,
inp = init('#inp');
ok(inp.is('.hasDatepicker'), 'Default - marker class set');
ok($.data(inp[0], PROP_NAME), 'Default - instance present');
ok($.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance present');
ok(inp.next().is('#alt'), 'Default - button absent');
inp.datepicker('destroy');
inp = $('#inp');
ok(!inp.is('.hasDatepicker'), 'Default - marker class cleared');
ok(!$.data(inp[0], PROP_NAME), 'Default - instance absent');
ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance absent');
ok(inp.next().is('#alt'), 'Default - button absent');
// With button
inp= init('#inp', {showOn: 'both'});
ok(inp.is('.hasDatepicker'), 'Button - marker class set');
ok($.data(inp[0], PROP_NAME), 'Button - instance present');
ok($.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance present');
ok(inp.next().text() === '...', 'Button - button added');
inp.datepicker('destroy');
inp = $('#inp');
ok(!inp.is('.hasDatepicker'), 'Button - marker class cleared');
ok(!$.data(inp[0], PROP_NAME), 'Button - instance absent');
ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance absent');
ok(inp.next().is('#alt'), 'Button - button removed');
// With append text
inp = init('#inp', {appendText: 'Testing'});
ok(inp.is('.hasDatepicker'), 'Append - marker class set');
ok($.data(inp[0], PROP_NAME), 'Append - instance present');
ok($.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance present');
ok(inp.next().text() === 'Testing', 'Append - append text added');
inp.datepicker('destroy');
inp = $('#inp');
ok(!inp.is('.hasDatepicker'), 'Append - marker class cleared');
ok(!$.data(inp[0], PROP_NAME), 'Append - instance absent');
ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance absent');
ok(inp.next().is('#alt'), 'Append - append text removed');
// With both
inp= init('#inp', {showOn: 'both', buttonImageOnly: true,
buttonImage: 'img/calendar.gif', appendText: 'Testing'});
ok(inp.is('.hasDatepicker'), 'Both - marker class set');
ok($.data(inp[0], PROP_NAME), 'Both - instance present');
ok($.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance present');
ok(inp.next()[0].nodeName.toLowerCase() === 'img', 'Both - button added');
ok(inp.next().next().text() === 'Testing', 'Both - append text added');
inp.datepicker('destroy');
inp = $('#inp');
ok(!inp.is('.hasDatepicker'), 'Both - marker class cleared');
ok(!$.data(inp[0], PROP_NAME), 'Both - instance absent');
ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance absent');
ok(inp.next().is('#alt'), 'Both - button and append text absent');
// Inline
inl = init('#inl');
ok(inl.is('.hasDatepicker'), 'Inline - marker class set');
ok(inl.html() !== '', 'Inline - datepicker present');
ok($.data(inl[0], PROP_NAME), 'Inline - instance present');
ok($.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance present');
ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
inl.datepicker('destroy');
inl = $('#inl');
ok(!inl.is('.hasDatepicker'), 'Inline - marker class cleared');
ok(inl.html() === '', 'Inline - datepicker absent');
ok(!$.data(inl[0], PROP_NAME), 'Inline - instance absent');
ok(!$.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance absent');
ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
});

Expand Down
24 changes: 7 additions & 17 deletions tests/unit/datepicker/datepicker_options.js
Expand Up @@ -8,7 +8,7 @@ module("datepicker: options");

test('setDefaults', function() {
expect( 3 );
var inp = init('#inp');
init('#inp');
equal($.datepicker._defaults.showOn, 'focus', 'Initial showOn');
$.datepicker.setDefaults({showOn: 'button'});
equal($.datepicker._defaults.showOn, 'button', 'Change default showOn');
Expand All @@ -19,7 +19,7 @@ test('setDefaults', function() {
test('option', function() {
expect( 17 );
var inp = init('#inp'),
inst = $.data(inp[0], PROP_NAME);
inst = $.data(inp[0], TestHelpers.PROP_NAME);
// Set option
equal(inst.settings.showOn, null, 'Initial setting showOn');
equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
Expand Down Expand Up @@ -51,7 +51,7 @@ test('option', function() {
test('change', function() {
expect( 12 );
var inp = init('#inp'),
inst = $.data(inp[0], PROP_NAME);
inst = $.data(inp[0], TestHelpers.PROP_NAME);
equal(inst.settings.showOn, null, 'Initial setting showOn');
equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
equal($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
Expand Down Expand Up @@ -215,12 +215,12 @@ test('defaultDate', function() {
inp.datepicker('option', {defaultDate: ' -1 m '}).
datepicker('hide').val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
date = addMonths(new Date(), -1);
date = TestHelpers.addMonths(new Date(), -1);
equalsDate(inp.datepicker('getDate'), date, 'Default date -1 m');
inp.datepicker('option', {defaultDate: '+2M'}).
datepicker('hide').val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
date = addMonths(new Date(), 2);
date = TestHelpers.addMonths(new Date(), 2);
equalsDate(inp.datepicker('getDate'), date, 'Default date +2M');
inp.datepicker('option', {defaultDate: '-2y'}).
datepicker('hide').val('').datepicker('show').
Expand All @@ -236,7 +236,7 @@ test('defaultDate', function() {
inp.datepicker('option', {defaultDate: '+1M +10d'}).
datepicker('hide').val('').datepicker('show').
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
date = addMonths(new Date(), 1);
date = TestHelpers.addMonths(new Date(), 1);
date.setDate(date.getDate() + 10);
equalsDate(inp.datepicker('getDate'), date, 'Default date +1M +10d');
// String date values
Expand Down Expand Up @@ -380,7 +380,7 @@ test('minMax', function() {
simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
equalsDate(inp.datepicker('getDate'), date,
'Min/max - -1w, +1 M +10 D - ctrl+pgup');
date = addMonths(new Date(), 1);
date = TestHelpers.addMonths(new Date(), 1);
date.setDate(date.getDate() + 10);
inp.val('').datepicker('show');
inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
Expand Down Expand Up @@ -665,16 +665,6 @@ function beforeDay(date) {
(date.getDate() % 3 === 0 ? 'Divisble by 3' : '')];
}

function calcWeek(date) {
var doy = date.getDate() + 6,
m = date.getMonth() - 1;
for (; m >= 0; m--) {
doy += $.datepicker._getDaysInMonth(date.getFullYear(), m);
}
// Simple count from 01/01 starting at week 1
return Math.floor(doy / 7);
}

test('callbacks', function() {
expect( 13 );
// Before show
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/datepicker/datepicker_tickets.js
Expand Up @@ -8,7 +8,7 @@ module("datepicker: tickets");
// http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
test('beforeShowDay-getDate', function() {
expect( 3 );
var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
var inp = init('#inp', {beforeShowDay: function() { inp.datepicker('getDate'); return [true, '']; }}),
dp = $('#ui-datepicker-div');
inp.val('01/01/2010').datepicker('show');
// contains non-breaking space
Expand Down

0 comments on commit e123099

Please sign in to comment.