Skip to content

Commit 2fe43bb

Browse files
fnagelfnagel
committed
Calendar: Fix jscs errors after merging master
1 parent 7e8b723 commit 2fe43bb

File tree

14 files changed

+159
-152
lines changed

14 files changed

+159
-152
lines changed

‎tests/unit/calendar/common.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ common.testWidget( "calendar", {
2828
create: null,
2929
select: null
3030
}
31-
});
31+
} );
3232

3333
} );

‎tests/unit/calendar/core.js‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test( "base structure", function() {
5151
element.calendar( "option", "buttons", {
5252
"test": function() {},
5353
"test button": function() {}
54-
});
54+
} );
5555

5656
equal( dp.children().length, 3, "Structure buttons - child count (header, calendar, buttonpane)" );
5757

@@ -65,6 +65,7 @@ test( "base structure", function() {
6565
}
6666

6767
function step3() {
68+
6869
// Multi-month 2
6970
element = $( "#calendar" ).calendar( { numberOfMonths: 2 } );
7071
dp = element.calendar( "widget" );
@@ -79,7 +80,7 @@ test( "base structure", function() {
7980
}
8081

8182
step1();
82-
});
83+
} );
8384

8485
test( "Localization", function() {
8586
expect( 10 );
@@ -130,20 +131,20 @@ test( "Localization", function() {
130131
.calendar( "option", optionsDe )
131132
.calendar( "refresh" );
132133
testLocalization( "After init: " );
133-
});
134+
} );
134135

135136
asyncTest( "keyboard handling", function() {
136137
expect( 10 );
137138

138139
var element = $( "#calendar" );
139140

140141
function step1() {
141-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
142+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
142143

143144
testHelper
144145
.focusGrid( element )
145146
.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
146-
setTimeout(function() {
147+
setTimeout( function() {
147148
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
148149
testHelper.equalsDate(
149150
element.calendar( "valueAsDate" ),
@@ -156,7 +157,7 @@ asyncTest( "keyboard handling", function() {
156157
}
157158

158159
function step2() {
159-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
160+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
160161

161162
testHelper.focusGrid( element )
162163
.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } )
@@ -171,10 +172,10 @@ asyncTest( "keyboard handling", function() {
171172
}
172173

173174
function step3() {
174-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
175+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
175176

176177
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
177-
setTimeout(function() {
178+
setTimeout( function() {
178179
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
179180
testHelper.equalsDate(
180181
element.calendar( "valueAsDate" ),
@@ -187,10 +188,10 @@ asyncTest( "keyboard handling", function() {
187188
}
188189

189190
function step4() {
190-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
191+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
191192

192193
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
193-
setTimeout(function() {
194+
setTimeout( function() {
194195
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
195196
testHelper.equalsDate(
196197
element.calendar( "valueAsDate" ),
@@ -203,10 +204,10 @@ asyncTest( "keyboard handling", function() {
203204
}
204205

205206
function step5() {
206-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
207+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
207208

208209
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
209-
setTimeout(function() {
210+
setTimeout( function() {
210211
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
211212
testHelper.equalsDate(
212213
element.calendar( "valueAsDate" ),
@@ -219,11 +220,11 @@ asyncTest( "keyboard handling", function() {
219220
}
220221

221222
function step6() {
222-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
223+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
223224

224225
testHelper.focusGrid( element )
225226
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP, altKey: true } );
226-
setTimeout(function() {
227+
setTimeout( function() {
227228
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
228229
testHelper.equalsDate(
229230
element.calendar( "valueAsDate" ),
@@ -236,10 +237,10 @@ asyncTest( "keyboard handling", function() {
236237
}
237238

238239
function step7() {
239-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
240+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
240241

241242
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
242-
setTimeout(function() {
243+
setTimeout( function() {
243244
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
244245
testHelper.equalsDate(
245246
element.calendar( "valueAsDate" ),
@@ -252,11 +253,11 @@ asyncTest( "keyboard handling", function() {
252253
}
253254

254255
function step8() {
255-
element.calendar({ value: new Date( 2014, 1 - 1, 1 ) });
256+
element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
256257

257258
testHelper.focusGrid( element )
258259
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN, altKey: true } );
259-
setTimeout(function() {
260+
setTimeout( function() {
260261
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
261262
testHelper.equalsDate(
262263
element.calendar( "valueAsDate" ),
@@ -270,10 +271,10 @@ asyncTest( "keyboard handling", function() {
270271

271272
// Check for moving to short months
272273
function step9() {
273-
element.calendar({ value: new Date( 2014, 3 - 1, 31 ) });
274+
element.calendar( { value: new Date( 2014, 3 - 1, 31 ) } );
274275

275276
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
276-
setTimeout(function() {
277+
setTimeout( function() {
277278
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
278279
testHelper.equalsDate(
279280
element.calendar( "valueAsDate" ),
@@ -286,10 +287,10 @@ asyncTest( "keyboard handling", function() {
286287
}
287288

288289
function step10() {
289-
element.calendar({ value: new Date( 2016, 1 - 1, 30 ) });
290+
element.calendar( { value: new Date( 2016, 1 - 1, 30 ) } );
290291

291292
testHelper.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
292-
setTimeout(function() {
293+
setTimeout( function() {
293294
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
294295
testHelper.equalsDate(
295296
element.calendar( "valueAsDate" ),
@@ -302,7 +303,7 @@ asyncTest( "keyboard handling", function() {
302303
}
303304

304305
step1();
305-
});
306+
} );
306307

307308
asyncTest( "mouse", function() {
308309
expect( 6 );
@@ -319,7 +320,7 @@ asyncTest( "mouse", function() {
319320
"Mouse click"
320321
);
321322

322-
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4) );
323+
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
323324
$( ".ui-calendar-calendar tbody button:contains(12)", element ).simulate( "mousedown" );
324325
testHelper.equalsDate(
325326
element.calendar( "valueAsDate" ),
@@ -328,7 +329,7 @@ asyncTest( "mouse", function() {
328329
);
329330

330331
// Previous/next
331-
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4) );
332+
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
332333
$( ".ui-calendar-prev", element ).simulate( "click" );
333334
$( ".ui-calendar-calendar tbody button:contains(16)", element ).simulate( "mousedown" );
334335
testHelper.equalsDate(
@@ -337,7 +338,7 @@ asyncTest( "mouse", function() {
337338
"Mouse click - previous"
338339
);
339340

340-
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4) );
341+
element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
341342
$( ".ui-calendar-next", element ).simulate( "click" );
342343
$( ".ui-calendar-calendar tbody button:contains(18)", element ).simulate( "mousedown" );
343344
testHelper.equalsDate(
@@ -352,11 +353,11 @@ asyncTest( "mouse", function() {
352353
// Previous/next with minimum/maximum
353354
function step2() {
354355
element.calendar( "destroy" );
355-
element.calendar({
356-
value: new Date( 2008, 3 - 1, 4),
356+
element.calendar( {
357+
value: new Date( 2008, 3 - 1, 4 ),
357358
min: new Date( 2008, 2 - 1, 2 ),
358359
max: new Date( 2008, 2 - 1, 26 )
359-
});
360+
} );
360361

361362
$( ".ui-calendar-prev", element ).simulate( "click" );
362363
$( "tbody button:contains(16)", element ).simulate( "mousedown" );
@@ -370,11 +371,11 @@ asyncTest( "mouse", function() {
370371

371372
function step3() {
372373
element.calendar( "destroy" );
373-
element.calendar({
374-
value: new Date( 2008, 1 - 1, 4),
374+
element.calendar( {
375+
value: new Date( 2008, 1 - 1, 4 ),
375376
min: new Date( 2008, 2 - 1, 2 ),
376377
max: new Date( 2008, 2 - 1, 26 )
377-
});
378+
} );
378379

379380
$( ".ui-calendar-next", element ).simulate( "click" );
380381
$( "tbody button:contains(18)", element ).simulate( "mousedown" );
@@ -387,6 +388,6 @@ asyncTest( "mouse", function() {
387388
}
388389

389390
step1();
390-
});
391+
} );
391392

392393
} );

‎tests/unit/calendar/methods.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ test( "destroy", function( assert ) {
1111

1212
assert.domEqual( "#calendar", function() {
1313
$( "#calendar" ).calendar().calendar( "destroy" );
14-
});
15-
});
14+
} );
15+
} );
1616

1717
test( "enable / disable", function() {
1818
expect( 8 );
@@ -30,7 +30,7 @@ test( "enable / disable", function() {
3030
ok( !element.hasClass( "ui-calendar-disabled" ), "no longer has disabled widget class name" );
3131
ok( !element.hasClass( "ui-state-disabled" ), "no longer has disabled state class name" );
3232
equal( element.attr( "aria-disabled" ), "false", "no longer has ARIA disabled" );
33-
});
33+
} );
3434

3535
test( "widget", function() {
3636
expect( 1 );
@@ -39,7 +39,7 @@ test( "widget", function() {
3939
widget = element.calendar( "widget" );
4040

4141
strictEqual( widget[ 0 ], element[ 0 ] );
42-
});
42+
} );
4343

4444
test( "value", function() {
4545
expect( 3 );
@@ -54,7 +54,7 @@ test( "value", function() {
5454

5555
element.calendar( "value", "abc" );
5656
equal( element.calendar( "value" ), "1/1/14", "Setting invalid values should be ignored." );
57-
});
57+
} );
5858

5959
test( "valueAsDate", function() {
6060
expect( 11 );
@@ -77,7 +77,7 @@ test( "valueAsDate", function() {
7777
equal( element.calendar( "valueAsDate" ), null, "Set date - default" );
7878

7979
element.calendar( "valueAsDate", date1 );
80-
testHelper.equalsDate(element.calendar( "valueAsDate" ), date1, "Set date - 2008-06-04" );
80+
testHelper.equalsDate( element.calendar( "valueAsDate" ), date1, "Set date - 2008-06-04" );
8181

8282
// With minimum/maximum
8383
element = $( "#calendar" ).calendar();
@@ -140,6 +140,6 @@ test( "valueAsDate", function() {
140140
dateAndTimeClone.getTime(),
141141
"Date object passed should not be changed by valueAsDate"
142142
);
143-
});
143+
} );
144144

145145
} );

0 commit comments

Comments
 (0)