Skip to content

Commit 3d6c2a6

Browse files
scottgonzalezscottgonzalez
committed
Tabs: Removed back-compat for load event. Fixes #8731 - Tabs: Remove back-compat for load event.
1 parent 828b3c4 commit 3d6c2a6

File tree

4 files changed

+49
-132
lines changed

4 files changed

+49
-132
lines changed

‎tests/unit/tabs/tabs_deprecated.js

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -66,67 +66,6 @@ test( "tabTemplate + panelTemplate", function() {
6666
ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" );
6767
});
6868

69-
module( "tabs (deprecated): events" );
70-
71-
asyncTest( "load", function() {
72-
expect( 15 );
73-
74-
var tab, anchor, panelId, panel,
75-
element = $( "#tabs2" );
76-
77-
// init
78-
element.one( "tabsload", function( event, ui ) {
79-
tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
80-
anchor = tab.find( ".ui-tabs-anchor" );
81-
panelId = tab.attr( "aria-controls" );
82-
panel = $( "#" + panelId );
83-
84-
ok( !( "originalEvent" in event ), "originalEvent" );
85-
strictEqual( ui.tab, anchor[ 0 ], "tab" );
86-
strictEqual( ui.panel, panel[ 0 ], "panel" );
87-
equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
88-
state( element, 0, 0, 1, 0, 0 );
89-
tabsload1();
90-
});
91-
element.tabs({ active: 2 });
92-
93-
function tabsload1() {
94-
// .option()
95-
element.one( "tabsload", function( event, ui ) {
96-
tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
97-
anchor = tab.find( ".ui-tabs-anchor" );
98-
panelId = tab.attr( "aria-controls" );
99-
panel = $( "#" + panelId );
100-
101-
ok( !( "originalEvent" in event ), "originalEvent" );
102-
strictEqual( ui.tab, anchor[ 0 ], "tab" );
103-
strictEqual( ui.panel, panel[ 0 ], "panel" );
104-
equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
105-
state( element, 0, 0, 0, 1, 0 );
106-
tabsload2();
107-
});
108-
element.tabs( "option", "active", 3 );
109-
}
110-
111-
function tabsload2() {
112-
// click, change panel content
113-
element.one( "tabsload", function( event, ui ) {
114-
tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
115-
anchor = tab.find( ".ui-tabs-anchor" );
116-
panelId = tab.attr( "aria-controls" );
117-
panel = $( "#" + panelId );
118-
119-
equal( event.originalEvent.type, "click", "originalEvent" );
120-
strictEqual( ui.tab, anchor[ 0 ], "tab" );
121-
strictEqual( ui.panel, panel[ 0 ], "panel" );
122-
equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
123-
state( element, 0, 0, 0, 0, 1 );
124-
start();
125-
});
126-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
127-
}
128-
});
129-
13069
module( "tabs (deprecated): methods" );
13170

13271
test( "add", function() {

‎tests/unit/tabs/tabs_events.js

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -253,16 +253,33 @@ test( "beforeLoad", function() {
253253
equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
254254
});
255255

256-
if ( $.uiBackCompat === false ) {
257-
asyncTest( "load", function() {
258-
expect( 21 );
256+
asyncTest( "load", function() {
257+
expect( 21 );
259258

260-
var tab, panelId, panel,
261-
element = $( "#tabs2" );
259+
var tab, panelId, panel,
260+
element = $( "#tabs2" );
261+
262+
// init
263+
element.one( "tabsload", function( event, ui ) {
264+
tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
265+
panelId = tab.attr( "aria-controls" );
266+
panel = $( "#" + panelId );
267+
268+
ok( !( "originalEvent" in event ), "originalEvent" );
269+
equal( ui.tab.length, 1, "tab length" );
270+
strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
271+
equal( ui.panel.length, 1, "panel length" );
272+
strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
273+
equal( ui.panel.find( "p" ).length, 1, "panel html" );
274+
state( element, 0, 0, 1, 0, 0 );
275+
tabsload1();
276+
});
277+
element.tabs({ active: 2 });
262278

263-
// init
279+
function tabsload1() {
280+
// .option()
264281
element.one( "tabsload", function( event, ui ) {
265-
tab = element.find( ".ui-tabs-nav li" ).eq( 2 );
282+
tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
266283
panelId = tab.attr( "aria-controls" );
267284
panel = $( "#" + panelId );
268285

@@ -272,49 +289,30 @@ if ( $.uiBackCompat === false ) {
272289
equal( ui.panel.length, 1, "panel length" );
273290
strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
274291
equal( ui.panel.find( "p" ).length, 1, "panel html" );
275-
state( element, 0, 0, 1, 0, 0 );
276-
tabsload1();
292+
state( element, 0, 0, 0, 1, 0 );
293+
tabsload2();
277294
});
278-
element.tabs({ active: 2 });
279-
280-
function tabsload1() {
281-
// .option()
282-
element.one( "tabsload", function( event, ui ) {
283-
tab = element.find( ".ui-tabs-nav li" ).eq( 3 );
284-
panelId = tab.attr( "aria-controls" );
285-
panel = $( "#" + panelId );
286-
287-
ok( !( "originalEvent" in event ), "originalEvent" );
288-
equal( ui.tab.length, 1, "tab length" );
289-
strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
290-
equal( ui.panel.length, 1, "panel length" );
291-
strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
292-
equal( ui.panel.find( "p" ).length, 1, "panel html" );
293-
state( element, 0, 0, 0, 1, 0 );
294-
tabsload2();
295-
});
296-
element.tabs( "option", "active", 3 );
297-
}
295+
element.tabs( "option", "active", 3 );
296+
}
298297

299-
function tabsload2() {
300-
// click, change panel content
301-
element.one( "tabsload", function( event, ui ) {
302-
tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
303-
panelId = tab.attr( "aria-controls" );
304-
panel = $( "#" + panelId );
305-
306-
equal( event.originalEvent.type, "click", "originalEvent" );
307-
equal( ui.tab.length, 1, "tab length" );
308-
strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
309-
equal( ui.panel.length, 1, "panel length" );
310-
strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
311-
equal( ui.panel.find( "p" ).length, 1, "panel html" );
312-
state( element, 0, 0, 0, 0, 1 );
313-
start();
314-
});
315-
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
316-
}
317-
});
318-
}
298+
function tabsload2() {
299+
// click, change panel content
300+
element.one( "tabsload", function( event, ui ) {
301+
tab = element.find( ".ui-tabs-nav li" ).eq( 4 );
302+
panelId = tab.attr( "aria-controls" );
303+
panel = $( "#" + panelId );
304+
305+
equal( event.originalEvent.type, "click", "originalEvent" );
306+
equal( ui.tab.length, 1, "tab length" );
307+
strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
308+
equal( ui.panel.length, 1, "panel length" );
309+
strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
310+
equal( ui.panel.find( "p" ).length, 1, "panel html" );
311+
state( element, 0, 0, 0, 0, 1 );
312+
start();
313+
});
314+
element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click();
315+
}
316+
});
319317

320318
}( jQuery ) );

‎tests/unit/tabs/tabs_methods.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,7 @@ asyncTest( "load", function() {
198198

199199
ok( !( "originalEvent" in event ), "originalEvent" );
200200
equal( uiTab.length, 1, "tab length" );
201-
if ( $.uiBackCompat === false ) {
202-
strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
203-
} else {
204-
strictEqual( uiTab[ 0 ], tab.find( ".ui-tabs-anchor" )[ 0 ], "tab" );
205-
}
201+
strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
206202
equal( uiPanel.length, 1, "panel length" );
207203
strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
208204
equal( uiPanel.find( "p" ).length, 1, "panel html" );
@@ -249,11 +245,7 @@ asyncTest( "load", function() {
249245

250246
ok( !( "originalEvent" in event ), "originalEvent" );
251247
equal( uiTab.length, 1, "tab length" );
252-
if ( $.uiBackCompat === false ) {
253-
strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
254-
} else {
255-
strictEqual( uiTab[ 0 ], tab.find( ".ui-tabs-anchor" )[ 0 ], "tab" );
256-
}
248+
strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
257249
equal( uiPanel.length, 1, "panel length" );
258250
strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
259251
state( element, 0, 0, 0, 1, 0 );

‎ui/jquery.ui.tabs.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -974,18 +974,6 @@ if ( $.uiBackCompat !== false ) {
974974
.data( "ui-tabs-destroy", true );
975975
}
976976
});
977-
978-
// load event
979-
$.widget( "ui.tabs", $.ui.tabs, {
980-
_trigger: function( type, event, data ) {
981-
var _data = $.extend( {}, data );
982-
if ( type === "load" ) {
983-
_data.panel = _data.panel[ 0 ];
984-
_data.tab = _data.tab.find( ".ui-tabs-anchor" )[ 0 ];
985-
}
986-
return this._super( type, event, _data );
987-
}
988-
});
989977
}
990978

991979
})( jQuery );

0 commit comments

Comments
 (0)