Skip to content

Commit c25a541

Browse files
committed
Tabs: Remove core event/alias and deprecated module dependencies
1 parent 89bf0d0 commit c25a541

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

demos/tabs/manipulation.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
});
4949

5050
// addTab form: calls addTab function on submit and closes the dialog
51-
var form = dialog.find( "form" ).submit(function( event ) {
51+
var form = dialog.find( "form" ).on( "submit", function( event ) {
5252
addTab();
5353
dialog.dialog( "close" );
5454
event.preventDefault();
@@ -70,18 +70,18 @@
7070
// addTab button: just opens the dialog
7171
$( "#add_tab" )
7272
.button()
73-
.click(function() {
73+
.on( "click", function() {
7474
dialog.dialog( "open" );
7575
});
7676

7777
// close icon: removing the tab on click
78-
tabs.delegate( "span.ui-icon-close", "click", function() {
78+
tabs.on( "click", "span.ui-icon-close", function() {
7979
var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
8080
$( "#" + panelId ).remove();
8181
tabs.tabs( "refresh" );
8282
});
8383

84-
tabs.bind( "keyup", function( event ) {
84+
tabs.on( "keyup", function( event ) {
8585
if ( event.altKey && event.keyCode === $.ui.keyCode.BACKSPACE ) {
8686
var panelId = tabs.find( ".ui-tabs-active" ).remove().attr( "aria-controls" );
8787
$( "#" + panelId ).remove();

tests/unit/tabs/events.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ test( "beforeActivate", function() {
8585
strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
8686
state( element, 1, 0, 0 );
8787
});
88-
anchors.eq( 1 ).click();
88+
anchors.eq( 1 ).trigger( "click" );
8989
state( element, 0, 1, 0 );
9090

9191
// collapsing
@@ -156,7 +156,7 @@ test( "activate", function() {
156156
strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
157157
state( element, 0, 1, 0 );
158158
});
159-
anchors.eq( 1 ).click();
159+
anchors.eq( 1 ).trigger( "click" );
160160
state( element, 0, 1, 0 );
161161

162162
// collapsing
@@ -251,7 +251,7 @@ test( "beforeLoad", function() {
251251
event.preventDefault();
252252
state( element, 0, 0, 1, 0, 0 );
253253
});
254-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 3 ).click();
254+
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 3 ).trigger( "click" );
255255
state( element, 0, 0, 0, 1, 0 );
256256
// .toLowerCase() is needed to convert <P> to <p> in old IEs
257257
equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
@@ -315,7 +315,7 @@ asyncTest( "load", function() {
315315
state( element, 0, 0, 0, 0, 1 );
316316
start();
317317
});
318-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
318+
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).trigger( "click" );
319319
}
320320
});
321321

tests/unit/tabs/options.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ test( "{ active: Number }", function() {
6868
equal( element.tabs( "option", "active" ), 0 );
6969
state( element, 1, 0, 0 );
7070

71-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).click();
71+
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).trigger( "click" );
7272
equal( element.tabs( "option", "active" ), 1 );
7373
state( element, 0, 1, 0 );
7474

@@ -127,7 +127,7 @@ test( "collapsible", function( assert ) {
127127
equal( element.tabs( "option", "active" ), 1 );
128128
state( element, 0, 1, 0 );
129129

130-
element.find( ".ui-state-active .ui-tabs-anchor" ).click();
130+
element.find( ".ui-state-active .ui-tabs-anchor" ).trigger( "click" );
131131
equal( element.tabs( "option", "active" ), false );
132132
state( element, 0, 0, 0 );
133133

@@ -146,7 +146,7 @@ test( "collapsible", function( assert ) {
146146
equal( element.tabs( "option", "active" ), 1 );
147147
state( element, 0, 1, 0 );
148148

149-
element.find( ".ui-state-active .ui-tabs-anchor" ).eq( 1 ).click();
149+
element.find( ".ui-state-active .ui-tabs-anchor" ).eq( 1 ).trigger( "click" );
150150
equal( element.tabs( "option", "active" ), 1 );
151151
state( element, 0, 1, 0 );
152152

@@ -210,7 +210,7 @@ test( "{ event: null }", function() {
210210
state( element, 0, 1, 0 );
211211

212212
// ensure default click handler isn't bound
213-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).click();
213+
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 2 ).trigger( "click" );
214214
equal( element.tabs( "option", "active" ), 1 );
215215
state( element, 0, 1, 0 );
216216
});

ui/tabs.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ $.widget( "ui.tabs", {
233233
// Ctrl+up moves focus to the current tab
234234
if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
235235
event.preventDefault();
236-
this.active.focus();
236+
this.active.trigger( "focus" );
237237
}
238238
},
239239

@@ -271,7 +271,7 @@ $.widget( "ui.tabs", {
271271

272272
_focusNextTab: function( index, goingForward ) {
273273
index = this._findNextTab( index, goingForward );
274-
this.tabs.eq( index ).focus();
274+
this.tabs.eq( index ).trigger( "focus" );
275275
return index;
276276
},
277277

@@ -394,7 +394,7 @@ $.widget( "ui.tabs", {
394394

395395
// Prevent users from focusing disabled tabs via click
396396
this.tablist
397-
.delegate( "> li", "mousedown" + this.eventNamespace, function( event ) {
397+
.on( "mousedown" + this.eventNamespace, "> li", function( event ) {
398398
if ( $( this ).is( ".ui-state-disabled" ) ) {
399399
event.preventDefault();
400400
}
@@ -406,7 +406,7 @@ $.widget( "ui.tabs", {
406406
// We don't have to worry about focusing the previously focused
407407
// element since clicking on a non-focusable element should focus
408408
// the body anyway.
409-
.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
409+
.on( "focus" + this.eventNamespace, ".ui-tabs-anchor", function() {
410410
if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
411411
this.blur();
412412
}
@@ -726,7 +726,7 @@ $.widget( "ui.tabs", {
726726

727727
this.tablist
728728
.removeAttr( "role" )
729-
.unbind( this.eventNamespace );
729+
.off( this.eventNamespace );
730730

731731
this.anchors
732732
.removeAttr( "role tabIndex" )

0 commit comments

Comments
 (0)