Skip to content

Commit 6e1d9d4

Browse files
fnagelfnagel
committed
Calendar: Use document.activeElement for retrieving focused element
Fixes unit tests in phantom.
1 parent efe643e commit 6e1d9d4

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎tests/unit/calendar/calendar_core.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ asyncTest( "keyboard handling", function() {
139139
.focusGrid( element )
140140
.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
141141
setTimeout(function() {
142-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
142+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
143143
TestHelpers.calendar.equalsDate(
144144
element.calendar( "valueAsDate" ),
145145
new Date( 2013, 12 - 1, 31 ),
@@ -170,7 +170,7 @@ asyncTest( "keyboard handling", function() {
170170

171171
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
172172
setTimeout(function() {
173-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
173+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
174174
TestHelpers.calendar.equalsDate(
175175
element.calendar( "valueAsDate" ),
176176
new Date( 2013, 12 - 1, 25 ),
@@ -186,7 +186,7 @@ asyncTest( "keyboard handling", function() {
186186

187187
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
188188
setTimeout(function() {
189-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
189+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
190190
TestHelpers.calendar.equalsDate(
191191
element.calendar( "valueAsDate" ),
192192
new Date( 2014, 1 - 1, 8 ),
@@ -202,7 +202,7 @@ asyncTest( "keyboard handling", function() {
202202

203203
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
204204
setTimeout(function() {
205-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
205+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
206206
TestHelpers.calendar.equalsDate(
207207
element.calendar( "valueAsDate" ),
208208
new Date( 2013, 12 - 1, 1 ),
@@ -219,7 +219,7 @@ asyncTest( "keyboard handling", function() {
219219
TestHelpers.calendar.focusGrid( element )
220220
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP, altKey: true } );
221221
setTimeout(function() {
222-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
222+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
223223
TestHelpers.calendar.equalsDate(
224224
element.calendar( "valueAsDate" ),
225225
new Date( 2013, 1 - 1, 1 ),
@@ -235,7 +235,7 @@ asyncTest( "keyboard handling", function() {
235235

236236
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
237237
setTimeout(function() {
238-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
238+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
239239
TestHelpers.calendar.equalsDate(
240240
element.calendar( "valueAsDate" ),
241241
new Date( 2014, 2 - 1, 1 ),
@@ -252,7 +252,7 @@ asyncTest( "keyboard handling", function() {
252252
TestHelpers.calendar.focusGrid( element )
253253
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN, altKey: true } );
254254
setTimeout(function() {
255-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
255+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
256256
TestHelpers.calendar.equalsDate(
257257
element.calendar( "valueAsDate" ),
258258
new Date( 2015, 1 - 1, 1 ),
@@ -269,7 +269,7 @@ asyncTest( "keyboard handling", function() {
269269

270270
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
271271
setTimeout(function() {
272-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
272+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
273273
TestHelpers.calendar.equalsDate(
274274
element.calendar( "valueAsDate" ),
275275
new Date( 2014, 2 - 1, 28 ),
@@ -285,7 +285,7 @@ asyncTest( "keyboard handling", function() {
285285

286286
TestHelpers.calendar.focusGrid( element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
287287
setTimeout(function() {
288-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
288+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
289289
TestHelpers.calendar.equalsDate(
290290
element.calendar( "valueAsDate" ),
291291
new Date( 2016, 2 - 1, 29 ),

‎tests/unit/calendar/calendar_test_helpers.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ TestHelpers.calendar = {
1616
},
1717
focusGrid: function( element ) {
1818
element.find( ":tabbable" ).last().simulate( "focus" );
19-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
20-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
19+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
20+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
2121

22-
return $( ":focus" );
22+
return $( document.activeElement );
2323
}
2424
};

‎tests/unit/datepicker/datepicker_events.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ asyncTest( "select", function() {
108108
.simulate( "focus" )
109109
.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
110110
setTimeout(function() {
111-
$( ":focus" )
111+
$( document.activeElement )
112112
.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } )
113113
.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
114114
input.datepicker( "close" );
@@ -122,7 +122,7 @@ asyncTest( "select", function() {
122122
.simulate( "focus" )
123123
.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
124124
setTimeout(function() {
125-
$( ":focus" ).simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
125+
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
126126
input.datepicker( "close" );
127127
start();
128128
}, 100 );

0 commit comments

Comments
 (0)