Skip to content

Commit 8b4ce80

Browse files
committed
Autocomplete: Remove core event/alias and deprecated module dependencies
1 parent b240eed commit 8b4ce80

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

demos/autocomplete/combobox.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
})
9393
.removeClass( "ui-corner-all" )
9494
.addClass( "custom-combobox-toggle ui-corner-right" )
95-
.mousedown(function() {
95+
.on( "mousedown", function() {
9696
wasOpen = input.autocomplete( "widget" ).is( ":visible" );
9797
})
98-
.click(function() {
99-
input.focus();
98+
.on( "click", function() {
99+
input.trigger( "focus" );
100100

101101
// Close if already visible
102102
if ( wasOpen ) {
@@ -165,7 +165,7 @@
165165

166166
$(function() {
167167
$( "#combobox" ).combobox();
168-
$( "#toggle" ).click(function() {
168+
$( "#toggle" ).on( "click", function() {
169169
$( "#combobox" ).toggle();
170170
});
171171
});

demos/autocomplete/multiple-remote.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
$( "#birds" )
2929
// don't navigate away from the field on tab when selecting an item
30-
.bind( "keydown", function( event ) {
30+
.on( "keydown", function( event ) {
3131
if ( event.keyCode === $.ui.keyCode.TAB &&
3232
$( this ).autocomplete( "instance" ).menu.active ) {
3333
event.preventDefault();

demos/autocomplete/multiple.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
$( "#tags" )
4848
// don't navigate away from the field on tab when selecting an item
49-
.bind( "keydown", function( event ) {
49+
.on( "keydown", function( event ) {
5050
if ( event.keyCode === $.ui.keyCode.TAB &&
5151
$( this ).autocomplete( "instance" ).menu.active ) {
5252
event.preventDefault();

tests/unit/autocomplete/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ test( "allow form submit on enter when menu is not active", function() {
167167
delay: 0,
168168
minLength: 0
169169
});
170-
element.bind( "keypress", function( e ) {
170+
element.on( "keypress", function( e ) {
171171
didMove = !e.isDefaultPrevented();
172172
});
173173
element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );

tests/unit/autocomplete/events.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ $.each([
6666
}),
6767
menu = element.autocomplete( "widget" );
6868

69-
element.simulate( "focus" )[ settings.valueMethod ]( "j" ).keydown();
69+
element.simulate( "focus" )[ settings.valueMethod ]( "j" ).trigger( "keydown" );
7070
setTimeout(function() {
7171
ok( menu.is( ":visible" ), "menu is visible after delay" );
7272
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -112,10 +112,10 @@ asyncTest( "cancel search", function() {
112112
}
113113
}),
114114
menu = element.autocomplete( "widget" );
115-
element.val( "ja" ).keydown();
115+
element.val( "ja" ).trigger( "keydown" );
116116
setTimeout(function() {
117117
ok( menu.is( ":hidden" ), "menu is hidden after first search" );
118-
element.val( "java" ).keydown();
118+
element.val( "java" ).trigger( "keydown" );
119119
setTimeout(function() {
120120
ok( menu.is( ":visible" ), "menu is visible after second search" );
121121
equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
@@ -135,7 +135,7 @@ asyncTest( "cancel focus", function() {
135135
return false;
136136
}
137137
});
138-
element.val( "ja" ).keydown();
138+
element.val( "ja" ).trigger( "keydown" );
139139
setTimeout(function() {
140140
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
141141
equal( element.val(), customVal );
@@ -154,7 +154,7 @@ asyncTest( "cancel select", function() {
154154
return false;
155155
}
156156
});
157-
element.val( "ja" ).keydown();
157+
element.val( "ja" ).trigger( "keydown" );
158158
setTimeout(function() {
159159
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
160160
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
@@ -179,7 +179,7 @@ asyncTest( "blur during remote search", function() {
179179
ok( false, "opened after a blur" );
180180
}
181181
});
182-
ac.val( "ro" ).keydown();
182+
ac.val( "ro" ).trigger( "keydown" );
183183
});
184184

185185
} );

tests/unit/autocomplete/options.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function autoFocusTest( afValue, focusedLength ) {
8787
start();
8888
}
8989
});
90-
element.val( "ja" ).keydown();
90+
element.val( "ja" ).trigger( "keydown" );
9191
stop();
9292
}
9393

@@ -108,7 +108,7 @@ asyncTest( "delay", function() {
108108
delay: 25
109109
}),
110110
menu = element.autocomplete( "widget" );
111-
element.val( "ja" ).keydown();
111+
element.val( "ja" ).trigger( "keydown" );
112112

113113
ok( menu.is( ":hidden" ), "menu is closed immediately after search" );
114114

@@ -125,7 +125,7 @@ asyncTest( "disabled", function( assert ) {
125125
delay: 0
126126
}),
127127
menu = element.autocomplete( "disable" ).autocomplete( "widget" );
128-
element.val( "ja" ).keydown();
128+
element.val( "ja" ).trigger( "keydown" );
129129

130130
ok( menu.is( ":hidden" ) );
131131

ui/autocomplete.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ $.widget( "ui.autocomplete", {
233233
// we restore focus to ensure that the menu closes properly based on the user's
234234
// next actions.
235235
if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
236-
this.element.focus();
236+
this.element.trigger( "focus" );
237237
}
238238
} );
239239

@@ -262,7 +262,7 @@ $.widget( "ui.autocomplete", {
262262
if ( this.isNewMenu ) {
263263
this.isNewMenu = false;
264264
if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
265-
this.menu.blur();
265+
this.menu.trigger( "blur" );
266266

267267
this.document.one( "mousemove", function() {
268268
$( event.target ).trigger( event.originalEvent );
@@ -293,7 +293,7 @@ $.widget( "ui.autocomplete", {
293293

294294
// only trigger when focus was lost (click on menu)
295295
if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
296-
this.element.focus();
296+
this.element.trigger( "focus" );
297297
this.previous = previous;
298298
// #6109 - IE triggers two focus events and the second
299299
// is asynchronous, so we need to reset the previous

0 commit comments

Comments
 (0)