Skip to content

Commit b240eed

Browse files
committed
Accordion: Remove core event/alias and deprecated module dependencies
1 parent ad98cb1 commit b240eed

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

demos/accordion/custom-icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$( "#accordion" ).accordion({
2020
icons: icons
2121
});
22-
$( "#toggle" ).button().click(function() {
22+
$( "#toggle" ).button().on( "click", function() {
2323
if ( $( "#accordion" ).accordion( "option", "icons" ) ) {
2424
$( "#accordion" ).accordion( "option", "icons", null );
2525
} else {

demos/accordion/hoverintent.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
*/
2424
$.event.special.hoverintent = {
2525
setup: function() {
26-
$( this ).bind( "mouseover", jQuery.event.special.hoverintent.handler );
26+
$( this ).on( "mouseover", jQuery.event.special.hoverintent.handler );
2727
},
2828
teardown: function() {
29-
$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
29+
$( this ).off( "mouseover", jQuery.event.special.hoverintent.handler );
3030
},
3131
handler: function( event ) {
3232
var currentX, currentY, timeout,
@@ -42,8 +42,8 @@
4242

4343
function clear() {
4444
target
45-
.unbind( "mousemove", track )
46-
.unbind( "mouseout", clear );
45+
.off( "mousemove", track )
46+
.off( "mouseout", clear );
4747
clearTimeout( timeout );
4848
}
4949

@@ -75,7 +75,7 @@
7575
}
7676

7777
timeout = setTimeout( handler, 100 );
78-
target.bind({
78+
target.on({
7979
mousemove: track,
8080
mouseout: clear
8181
});

tests/unit/accordion/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
3838
test( "handle click on header-descendant", function() {
3939
expect( 1 );
4040
var element = $( "#navigation" ).accordion();
41-
$( "#navigation h2:eq(1) a" ).click();
41+
$( "#navigation h2:eq(1) a" ).trigger( "click" );
4242
state( element, 0, 1, 0 );
4343
});
4444

tests/unit/accordion/events.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ test( "beforeActivate", function() {
8282
strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
8383
state( element, 1, 0, 0 );
8484
});
85-
headers.eq( 1 ).click();
85+
headers.eq( 1 ).trigger( "click" );
8686
state( element, 0, 1, 0 );
8787

8888
element.one( "accordionbeforeactivate", function( event, ui ) {
@@ -142,7 +142,7 @@ test( "activate", function() {
142142
equal( ui.newPanel.length, 1 );
143143
strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
144144
});
145-
headers.eq( 1 ).click();
145+
headers.eq( 1 ).trigger( "click" );
146146

147147
element.one( "accordionactivate", function( event, ui ) {
148148
equal( ui.oldHeader.length, 1 );

tests/unit/accordion/options.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test( "{ active: Number }", function() {
6060
equal( element.accordion( "option", "active" ), 0 );
6161
state( element, 1, 0, 0 );
6262

63-
element.find( ".ui-accordion-header" ).eq( 1 ).click();
63+
element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
6464
equal( element.accordion( "option", "active" ), 1 );
6565
state( element, 0, 1, 0 );
6666

@@ -269,7 +269,7 @@ test( "{ collapsible: false }", function() {
269269
equal( element.accordion( "option", "active" ), 1 );
270270
state( element, 0, 1, 0 );
271271

272-
element.find( ".ui-accordion-header" ).eq( 1 ).click();
272+
element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
273273
equal( element.accordion( "option", "active" ), 1 );
274274
state( element, 0, 1, 0 );
275275
});
@@ -289,7 +289,7 @@ test( "{ collapsible: true }", function() {
289289
equal( element.accordion( "option", "active" ), 1 );
290290
state( element, 0, 1, 0 );
291291

292-
element.find( ".ui-accordion-header" ).eq( 1 ).click();
292+
element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
293293
equal( element.accordion( "option", "active" ), false );
294294
state( element, 0, 0, 0 );
295295
});
@@ -306,7 +306,7 @@ test( "{ event: null }", function() {
306306
state( element, 0, 1, 0 );
307307

308308
// ensure default click handler isn't bound
309-
element.find( ".ui-accordion-header" ).eq( 2 ).click();
309+
element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" );
310310
equal( element.accordion( "option", "active" ), 1 );
311311
state( element, 0, 1, 0 );
312312
});

ui/accordion.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ return $.widget( "ui.accordion", {
217217
if ( toFocus ) {
218218
$( event.target ).attr( "tabIndex", -1 );
219219
$( toFocus ).attr( "tabIndex", 0 );
220-
toFocus.focus();
220+
$( toFocus ).trigger( "focus" );
221221
event.preventDefault();
222222
}
223223
},
224224

225225
_panelKeyDown: function( event ) {
226226
if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
227-
$( event.currentTarget ).prev().focus();
227+
$( event.currentTarget ).prev().trigger( "focus" );
228228
}
229229
},
230230

0 commit comments

Comments
 (0)