8000 clean up unused vars in grunt and tests · faroncoder/jquery-ui@563595e · GitHub
[go: up one dir, main page]
Skip to content

Commit 563595e

Browse files
mikesherovmikesherov
committed
clean up unused vars in grunt and tests
1 parent d67522e commit 563595e

File tree

47 files changed

+249
-277
lines changed
  • autocomplete_events.js
  • autocomplete_options.js
  • button
  • datepicker
  • dialog
  • draggable
  • droppable
  • effects
  • menu
  • resizable
  • selectable
  • slider
  • sortable
  • spinner
  • tabs
  • testsuite.js
  • tooltip
  • widget

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    47 files changed

    +249
    -277
    lines changed

    ‎.jshintrc

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,5 +7,6 @@
    77
    "node": true,
    88
    "onevar": true,
    99
    "trailing": true,
    10-
    "undef": true
    10+
    "undef": true,
    11+
    "unused": true
    1112
    }

    ‎build/release/release.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -425,7 +425,7 @@ function abort( msg ) {
    425425
    function walk( methods ) {
    426426
    var method = methods.shift();
    427427

    428-
    function next( error ) {
    428+
    function next( ) {
    429429
    if ( methods.length ) {
    430430
    walk( methods );
    431431
    }

    ‎build/tasks/build.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -146,7 +146,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
    146146
    opts: {
    147147
    cwd: 'dist'
    148148
    }
    149-
    }, function( err, result ) {
    149+
    }, function( err ) {
    150150
    if ( err ) {
    151151
    grunt.log.error( err );
    152152
    done();

    ‎tests/.jshintrc

    Lines changed: 1 addition & 11 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,8 +11,8 @@
    1111
    "onevar": true,
    1212
    "trailing": true,
    1313
    "undef": true,
    14+
    "unused": true,
    1415
    "predef": [
    15-
    "addMonths",
    1616
    "asyncTest",
    1717
    "container",
    1818
    "deepEqual",
    @@ -29,24 +29,14 @@
    2929
    "Globalize",
    3030
    "heightAfter",
    3131
    "init",
    32-
    "isNotOpen",
    33-
    "isOpen",
    3432
    "modal",
    3533
    "module",
    3634
    "moved",
    3735
    "notEqual",
    3836
    "offsetAfter",
    3937
    "offsetBefore",
    4038
    "ok",
    41-
    "PROP_NAME",
    4239
    "QUnit",
    43-
    "restoreScroll",
    44-
    "shouldBeDroppable",
    45-
    "shouldmove",
    46-
    "shouldNotBeDroppable",
    47-
    "shouldnotmove",
    48-
    "shouldnotresize",
    49-
    "shouldresize",
    5040
    "start",
    5141
    "strictEqual",
    5242
    "stop",

    ‎tests/unit/autocomplete/autocomplete_core.js

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -109,8 +109,7 @@ test( "allow form submit on enter when menu is not active", function() {
    109109
    function arrowsMoveFocus( id, isKeyUp ) {
    110110
    expect( 1 );
    111111

    112-
    var didMove = false,
    113-
    element = $( id ).autocomplete({
    112+
    var element = $( id ).autocomplete({
    114113
    source: [ "a" ],
    115114
    delay: 0,
    116115
    minLength: 0

    ‎tests/unit/autocomplete/autocomplete_events.js

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -39,7 +39,7 @@ $.each([
    3939
    ], "response ui.content" );
    4040
    ui.content.splice( 0, 1 );
    4141
    },
    42-
    open: function( event ) {
    42+
    open: function() {
    4343
    ok( menu.is( ":visible" ), "menu open on open" );
    4444
    },
    4545
    focus: function( event, ui ) {
    @@ -127,7 +127,7 @@ asyncTest( "cancel focus", function() {
    127127
    element = $( "#autocomplete" ).autocomplete({
    128128
    delay: 0,
    129129
    source: data,
    130-
    focus: function( event, ui ) {
    130+
    focus: function() {
    131131
    $( this ).val( customVal );
    132132
    return false;
    133133
    }
    @@ -146,7 +146,7 @@ asyncTest( "cancel select", function() {
    146146
    element = $( "#autocomplete" ).autocomplete({
    147147
    delay: 0,
    148148
    source: data,
    149-
    select: function( event, ui ) {
    149+
    select: function() {
    150150
    $( this ).val( customVal );
    151151
    return false;
    152152
    }

    ‎tests/unit/autocomplete/autocomplete_options.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -33,7 +33,7 @@ function autoFocusTest( afValue, focusedLength ) {
    3333
    autoFocus: afValue,
    3434
    delay: 0,
    3535
    source: data,
    36-
    open: function( event, ui ) {
    36+
    open: function() {
    3737
    equal( element.autocomplete( "widget" ).children( ".ui-menu-item:first" ).find( ".ui-state-focus" ).length,
    3838
    focusedLength, "first item is " + (afValue ? "" : "not") + " auto focused" );
    3939
    start();

    ‎tests/unit/button/button_events.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    11
    /*
    22
    * button_events.js
    33
    */
    4-
    (function($) {
    4+
    (function() {
    55

    66
    module("button: events");
    77

    ‎tests/unit/datepicker/datepicker_core.js

    Lines changed: 3 additions & 15 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,31 +12,19 @@ function equalsDate(d1, d2, message) {
    1212
    equal(d1.toString(), d2.toString(), message);
    1313
    }
    1414

    15-
    function equalsDateArray(a1, a2, message) {
    16-
    if (!a1 || !a2) {
    17-
    ok(false, message + ' - missing dates');
    18-
    return;
    19-
    }
    20-
    a1[0] = (a1[0] ? new Date(a1[0].getFullYear(), a1[0].getMonth(), a1[0].getDate()) : '');
    21-
    a1[1] = (a1[1] ? new Date(a1[1].getFullYear(), a1[1].getMonth(), a1[1].getDate()) : '');
    22-
    a2[0] = (a2[0] ? new Date(a2[0].getFullYear(), a2[0].getMonth(), a2[0].getDate()) : '');
    23-
    a2[1] = (a2[1] ? new Date(a2[1].getFullYear(), a2[1].getMonth(), a2[1].getDate()) : '');
    24-
    deepEqual(a1, a2, message);
    25-
    }
    26-
    27-
    function addMonths(date, offset) {
    15+
    TestHelpers.addMonths = function(date, offset) {
    2816
    var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate();
    2917
    date.setDate(Math.min(date.getDate(), maxDay));
    3018
    date.setMonth(date.getMonth() + offset);
    3119
    return date;
    32-
    }
    20+
    };
    3321

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

    39-
    var PROP_NAME = 'datepicker';
    27+
    TestHelpers.PROP_NAME = 'datepicker';
    4028

    4129
    (function($) {
    4230

    ‎tests/unit/datepicker/datepicker_defaults.js

    Lines changed: 3 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,8 +2,10 @@
    22
    * datepicker_defaults.js
    33
    */
    44

    5+
    /*
    56
    var datepicker_defaults = {
    67
    disabled: false
    78
    };
    89
    9-
    //TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
    10+
    TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
    11+
    */

    ‎tests/unit/datepicker/datepicker_events.js

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -30,7 +30,7 @@ test('events', function() {
    3030
    inp.val('').datepicker('show').
    3131
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
    3232
    equal(selectedThis, inp[0], 'Callback selected this');
    33-
    equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback selected inst');
    33+
    equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback selected inst');
    3434
    equal(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
    3535
    'Callback selected date');
    3636
    inp.val('').datepicker('show').
    @@ -59,7 +59,7 @@ test('events', function() {
    5959
    inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_UP});
    6060
    date.setMonth(date.getMonth() - 1);
    6161
    equal(selectedThis, inp[0], 'Callback change month/year this');
    62-
    equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback change month/year inst');
    62+
    equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback change month/year inst');
    6363
    equal(selectedDate, newMonthYear(date),
    6464
    'Callback change month/year date - pgup');
    6565
    inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_DOWN});
    @@ -107,7 +107,7 @@ test('events', function() {
    107107
    val('').datepicker('show').
    108108
    simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
    109109
    equal(selectedThis, inp[0], 'Callback close this');
    110-
    equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback close inst');
    110+
    equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback close inst');
    111111
    equal(selectedDate, '', 'Callback close date - esc');
    112112
    inp.val('').datepicker('show').
    113113
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});

    ‎tests/unit/datepicker/datepicker_methods.js

    Lines changed: 10 additions & 10 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,56 +10,56 @@ test('destroy', function() {
    1010
    var inl,
    1111
    inp = init('#inp');
    1212
    ok(inp.is('.hasDatepicker'), 'Default - marker class set');
    13-
    ok($.data(inp[0], PROP_NAME), 'Default - instance present');
    13+
    ok($.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance present');
    1414
    ok(inp.next().is('#alt'), 'Default - button absent');
    1515
    inp.datepicker('destroy');
    1616
    inp = $('#inp');
    1717
    ok(!inp.is('.hasDatepicker'), 'Default - marker class cleared');
    18-
    ok(!$.data(inp[0], PROP_NAME), 'Default - instance absent');
    18+
    ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance absent');
    1919
    ok(inp.next().is('#alt'), 'Default - button absent');
    2020
    // With button
    2121
    inp= init('#inp', {showOn: 'both'});
    2222
    ok(inp.is('.hasDatepicker'), 'Button - marker class set');
    23-
    ok($.data(inp[0], PROP_NAME), 'Button - instance present');
    23+
    ok($.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance present');
    2424
    ok(inp.next().text() === '...', 'Button - button added');
    2525
    inp.datepicker('destroy');
    2626
    inp = $('#inp');
    2727
    ok(!inp.is('.hasDatepicker'), 'Button - marker class cleared');
    28-
    ok(!$.data(inp[0], PROP_NAME), 'Button - instance absent');
    28+
    ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance absent');
    2929
    ok(inp.next().is('#alt'), 'Button - button removed');
    3030
    // With append text
    3131
    inp = init('#inp', {appendText: 'Testing'});
    3232
    ok(inp.is('.hasDatepicker'), 'Append - marker class set');
    33-
    ok($.data(inp[0], PROP_NAME), 'Append - instance present');
    33+
    ok($.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance present');
    3434
    ok(inp.next().text() === 'Testing', 'Append - append text added');
    3535
    inp.datepicker('destroy');
    3636
    inp = $('#inp');
    3737
    ok(!inp.is('.hasDatepicker'), 'Append - marker class cleared');
    38-
    ok(!$.data(inp[0], PROP_NAME), 'Append - instance absent');
    38+
    ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance absent');
    3939
    ok(inp.next().is('#alt'), 'Append - append text removed');
    4040
    // With both
    4141
    inp= init('#inp', {showOn: 'both', buttonImageOnly: true,
    4242
    buttonImage: 'img/calendar.gif', appendText: 'Testing'});
    4343
    ok(inp.is('.hasDatepicker'), 'Both - marker class set');
    44-
    ok($.data(inp[0], PROP_NAME), 'Both - instance present');
    44+
    ok($.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance present');
    4545
    ok(inp.next()[0].nodeName.toLowerCase() === 'img', 'Both - button added');
    4646
    ok(inp.next().next().text() === 'Testing', 'Both - append text added');
    4747
    inp.datepicker('destroy');
    4848
    inp = $('#inp');
    4949
    ok(!inp.is('.hasDatepicker'), 'Both - marker class cleared');
    50-
    ok(!$.data(inp[0], PROP_NAME), 'Both - instance absent');
    50+
    ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance absent');
    5151
    ok(inp.next().is('#alt'), 'Both - button and append text absent');
    5252
    // Inline
    5353
    inl = init('#inl');
    5454
    ok(inl.is('.hasDatepicker'), 'Inline - marker class set');
    5555
    ok(inl.html() !== '', 'Inline - datepicker present');
    56-
    ok($.data(inl[0], PROP_NAME), 'Inline - instance present');
    56+
    ok($.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance present');
    5757
    ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
    5858
    inl.datepicker('destroy');
    5959
    inl = $('#inl');
    6060
    ok(!inl.is('.hasDatepicker'), 'Inline - marker class cleared');
    6161
    ok(inl.html() === '', 'Inline - datepicker absent');
    62-
    ok(!$.data(inl[0], PROP_NAME), 'Inline - instance absent');
    62+
    ok(!$.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance absent');
    6363
    ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
    6464
    });
    6565

    ‎tests/unit/datepicker/datepicker_options.js

    Lines changed: 7 additions & 17 deletions
    Original file line number
    Diff line numberDiff line change
    @@ -8,7 +8,7 @@ module("datepicker: options");
    88

    99
    test('setDefaults', function() {
    1010
    expect( 3 );
    11-
    var inp = init('#inp');
    11+
    init('#inp');
    1212
    equal($.datepicker._defaults.showOn, 'focus', 'Initial showOn');
    1313
    $.datepicker.setDefaults({showOn: 'button'});
    1414
    equal($.datepicker._defaults.showOn, 'button', 'Change default showOn');
    @@ -19,7 +19,7 @@ test('setDefaults', function() {
    1919
    test('option', function() {
    2020
    expect( 17 );
    2121
    var inp = init('#inp'),
    22-
    inst = $.data(inp[0], PROP_NAME);
    22+
    inst = $.data(inp[0], TestHelpers.PROP_NAME);
    2323
    // Set option
    2424
    equal(inst.settings.showOn, null, 'Initial setting showOn');
    2525
    equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
    @@ -51,7 +51,7 @@ test('option', function() {
    5151
    test('change', function() {
    5252
    expect( 12 );
    5353
    var inp = init('#inp'),
    54-
    inst = $.data(inp[0], PROP_NAME);
    54+
    inst = $.data(inp[0], TestHelpers.PROP_NAME);
    5555
    equal(inst.settings.showOn, null, 'Initial setting showOn');
    5656
    equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
    5757
    equal($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
    @@ -215,12 +215,12 @@ test('defaultDate', function() {
    215215
    inp.datepicker('option', {defaultDate: ' -1 m '}).
    216216
    datepicker('hide').val('').datepicker('show').
    217217
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
    218-
    date = addMonths(new Date(), -1);
    218+
    date = TestHelpers.addMonths(new Date(), -1);
    219219
    equalsDate(inp.datepicker('getDate'), date, 'Default date -1 m');
    220220
    inp.datepicker('option', {defaultDate: '+2M'}).
    221221
    datepicker('hide').val('').datepicker('show').
    222222
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
    223-
    date = addMonths(new Date(), 2);
    223+
    date = TestHelpers.addMonths(new Date(), 2);
    224224
    equalsDate(inp.datepicker('getDate'), date, 'Default date +2M');
    225225
    inp.datepicker('option', {defaultDate: '-2y'}).
    226226
    datepicker('hide').val('').datepicker('show').
    @@ -236,7 +236,7 @@ test('defaultDate', function() {
    236236
    inp.datepicker('option', {defaultDate: '+1M +10d'}).
    237237
    datepicker('hide').val('').datepicker('show').
    238238
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
    239-
    date = addMonths(new Date(), 1);
    239+
    date = TestHelpers.addMonths(new Date(), 1);
    240240
    date.setDate(date.getDate() + 10);
    241241
    equalsDate(inp.datepicker('getDate'), date, 'Default date +1M +10d');
    242242
    // String date values
    @@ -380,7 +380,7 @@ test('minMax', function() {
    380380
    simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
    381381
    equalsDate(inp.datepicker('getDate'), date,
    382382
    'Min/max - -1w, +1 M +10 D - ctrl+pgup');
    383-
    date = addMonths(new Date(), 1);
    383+
    date = TestHelpers.addMonths(new Date(), 1);
    384384
    date.setDate(date.getDate() + 10);
    385385
    inp.val('').datepicker('show');
    386386
    inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
    @@ -665,16 +665,6 @@ function beforeDay(date) {
    665665
    (date.getDate() % 3 === 0 ? 'Divisble by 3' : '')];
    666666
    }
    667667

    668-
    function calcWeek(date) {
    669-
    var doy = date.getDate() + 6,
    670-
    m = date.getMonth() - 1;
    671-
    for (; m >= 0; m--) {
    672-
    doy += $.datepicker._getDaysInMonth(date.getFullYear(), m);
    673-
    }
    674-
    // Simple count from 01/01 starting at week 1
    675-
    return Math.floor(doy / 7);
    676-
    }
    677-
    678668
    test('callbacks', function() {
    679669
    expect( 13 );
    680670
    // Before show

    ‎tests/unit/datepicker/datepicker_tickets.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@ module("datepicker: tickets");
    88
    // http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
    99
    test('beforeShowDay-getDate', function() {
    1010
    expect( 3 );
    11-
    var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
    11+
    var inp = init('#inp', {beforeShowDay: function() { inp.datepicker('getDate'); return [true, '']; }}),
    1212
    dp = $('#ui-datepicker-div');
    1313
    inp.val('01/01/2010').datepicker('show');
    1414
    // contains non-breaking space

    0 commit comments

    Comments
     (0)
    0