Skip to content

Commit 481c4f7

Browse files
jzaeffererjzaefferer
committed
Accordion: Removed deprecated activate method and expanded active option. Fixes #6837 - Accordion: Remove the activate method. Fixes #6853 - Accordion: Remove support for non-number/falsey values for active option.
1 parent bebeaba commit 481c4f7

File tree

3 files changed

+19
-141
lines changed

3 files changed

+19
-141
lines changed

‎tests/unit/accordion/accordion_deprecated.js

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -4,107 +4,6 @@ var equalHeight = TestHelpers.accordion.equalHeight,
44
setupTeardown = TestHelpers.accordion.setupTeardown,
55
state = TestHelpers.accordion.state;
66

7-
module( "accordion (deprecated): expanded active option, activate method", setupTeardown() );
8-
9-
test( "activate, numeric", function() {
10-
expect( 5 );
11-
var element = $( "#list1" ).accordion({ active: 1 });
12-
state( element, 0, 1, 0 );
13-
element.accordion( "activate", 2 );
14-
state( element, 0, 0, 1 );
15-
element.accordion( "activate", 0 );
16-
state( element, 1, 0, 0 );
17-
element.accordion( "activate", 1 );
18-
state( element, 0, 1, 0 );
19-
element.accordion( "activate", 2 );
20-
state( element, 0, 0, 1 );
21-
});
22-
23-
test( "activate, numeric, collapsible:true", function() {
24-
expect( 3 );
25-
var element = $( "#list1" ).accordion({ collapsible: true });
26-
element.accordion( "activate", 2 );
27-
state( element, 0, 0, 1 );
28-
element.accordion( "activate", 0 );
29-
state( element, 1, 0, 0 );
30-
element.accordion( "activate", -1 );
31-
state( element, 0, 0, 0 );
32-
});
33-
34-
test( "activate, boolean, collapsible: true", function() {
35-
expect( 2 );
36-
var element = $( "#list1" ).accordion({ collapsible: true });
37-
element.accordion( "activate", 2 );
38-
state( element, 0, 0, 1 );
39-
element.accordion( "activate", false );
40-
state( element, 0, 0, 0 );
41-
});
42-
43-
test( "activate, boolean, collapsible: false", function() {
44-
expect( 2 );
45-
var element = $( "#list1" ).accordion();
46-
element.accordion( "activate", 2 );
47-
state( element, 0, 0, 1 );
48-
element.accordion( "activate", false );
49-
state( element, 0, 0, 1 );
50-
});
51-
52-
test( "activate, string expression", function() {
53-
expect( 4 );
54-
var element = $( "#list1" ).accordion({ active: "h3:last" });
55-
state( element, 0, 0, 1 );
56-
element.accordion( "activate", ":first" );
57-
state( element, 1, 0, 0 );
58-
element.accordion( "activate", ":eq(1)" );
59-
state( element, 0, 1, 0 );
60-
element.accordion( "activate", ":last" );
61-
state( element, 0, 0, 1 );
62-
});
63-
64-
test( "activate, jQuery or DOM element", function() {
65-
expect( 3 );
66-
var element = $( "#list1" ).accordion({ active: $( "#list1 h3:last" ) });
67-
state( element, 0, 0, 1 );
68-
element.accordion( "activate", $( "#list1 h3:first" ) );
69-
state( element, 1, 0, 0 );
70-
element.accordion( "activate", $( "#list1 h3" )[ 1 ] );
71-
state( element, 0, 1, 0 );
72-
});
73-
74-
test( "{ active: Selector }", function() {
75-
expect( 2 );
76-
var element = $("#list1").accordion({
77-
active: "h3:last"
78-
});
79-
state( element, 0, 0, 1 );
80-
element.accordion( "option", "active", "h3:eq(1)" );
81-
state( element, 0, 1, 0 );
82-
});
83-
84-
test( "{ active: Element }", function() {
85-
expect( 2 );
86-
var element = $( "#list1" ).accordion({
87-
active: $( "#list1 h3:last" )[ 0 ]
88-
});
89-
state( element, 0, 0, 1 );
90-
element.accordion( "option", "active", $( "#list1 h3:eq(1)" )[ 0 ] );
91-
state( element, 0, 1, 0 );
92-
});
93-
94-
test( "{ active: jQuery Object }", function() {
95-
expect( 2 );
96-
var element = $( "#list1" ).accordion({
97-
active: $( "#list1 h3:last" )
98-
});
99-
state( element, 0, 0, 1 );
100-
element.accordion( "option", "active", $( "#list1 h3:eq(1)" ) );
101-
state( element, 0, 1, 0 );
102-
});
103-
104-
105-
106-
107-
1087
module( "accordion (deprecated) - resize", setupTeardown() );
1098

1109
test( "resize", function() {

‎tests/unit/accordion/accordion_options.js

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,28 +65,26 @@ test( "{ active: Number }", function() {
6565
state( element, 0, 1, 0 );
6666
});
6767

68-
if ( $.uiBackCompat === false ) {
69-
test( "{ active: -Number }", function() {
70-
expect( 8 );
71-
var element = $( "#list1" ).accordion({
72-
active: -1
73-
});
74-
equal( element.accordion( "option", "active" ), 2 );
75-
state( element, 0, 0, 1 );
76-
77-
element.accordion( "option", "active", -2 );
78-
equal( element.accordion( "option", "active" ), 1 );
79-
state( element, 0, 1, 0 );
80-
81-
element.accordion( "option", "active", -10 );
82-
equal( element.accordion( "option", "active" ), 1 );
83-
state( element, 0, 1, 0 );
84-
85-
element.accordion( "option", "active", -3 );
86-
equal( element.accordion( "option", "active" ), 0 );
87-
state( element, 1, 0, 0 );
68+
test( "{ active: -Number }", function() {
69+
expect( 8 );
70+
var element = $( "#list1" ).accordion({
71+
active: -1
8872
});
89-
}
73+
equal( element.accordion( "option", "active" ), 2 );
74+
state( element, 0, 0, 1 );
75+
76+
element.accordion( "option", "active", -2 );
77+
equal( element.accordion( "option", "active" ), 1 );
78+
state( element, 0, 1, 0 );
79+
80+
element.accordion( "option", "active", -10 );
81+
equal( element.accordion( "option", "active" ), 1 );
82+
state( element, 0, 1, 0 );
83+
84+
element.accordion( "option", "active", -3 );
85+
equal( element.accordion( "option", "active" ), 0 );
86+
state( element, 1, 0, 0 );
87+
});
9088

9189
test( "{ animate: false }", function() {
9290
expect( 3 );

‎ui/jquery.ui.accordion.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -544,25 +544,6 @@ $.widget( "ui.accordion", {
544544

545545
// DEPRECATED
546546
if ( $.uiBackCompat !== false ) {
547-
// expanded active option, activate method
548-
(function( $, prototype ) {
549-
prototype.activate = prototype._activate;
550-
551-
var _findActive = prototype._findActive;
552-
prototype._findActive = function( index ) {
553-
if ( index === -1 ) {
554-
index = false;
555-
}
556-
if ( index && typeof index !== "number" ) {
557-
index = this.headers.index( this.headers.filter( index ) );
558-
if ( index === -1 ) {
559-
index = false;
560-
}
561-
}
562-
return _findActive.call( this, index );
563-
};
564-
}( jQuery, jQuery.ui.accordion.prototype ) );
565-
566547
// resize method
567548
jQuery.ui.accordion.prototype.resize = jQuery.ui.accordion.prototype.refresh;
568549

0 commit comments

Comments
 (0)