Skip to content

Commit 9a00fd4

Browse files
petersendiditpetersendidit
committed
Tabs: Rename selected option to active. Fixes #7135 Tabs: Rename selected option to active
1 parent c363019 commit 9a00fd4

File tree

6 files changed

+136
-55
lines changed

6 files changed

+136
-55
lines changed

‎tests/unit/tabs/tabs_deprecated.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,55 @@ test('spinner', function() {
6565
});
6666
});
6767

68+
test('selected', function() {
69+
expect(11);
70+
71+
el = $('#tabs1').tabs();
72+
equals(el.tabs('option', 'selected'), 0, 'should be 0 by default');
73+
74+
el.tabs('destroy');
75+
//set a hash in the url
76+
location.hash = '#fragment-2';
77+
//selection of tab with divs ordered differently than list
78+
el = $('#tabs1').tabs();
79+
equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
80+
81+
el.tabs('destroy');
82+
//set a hash in the url
83+
location.hash = '#tabs7-2';
84+
//selection of tab with divs ordered differently than list
85+
el = $('#tabs7').tabs();
86+
equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
87+
88+
el.tabs('destroy');
89+
el = $('#tabs1').tabs({ selected: -1 });
90+
equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected');
91+
equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be selected' );
92+
equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );
93+
94+
el.tabs('destroy');
95+
el.tabs({ selected: null });
96+
equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected with value null (deprecated)');
97+
98+
el.tabs('destroy');
99+
el.tabs({ selected: 1 });
100+
equals(el.tabs('option', 'selected'), 1, 'should be specified tab');
101+
102+
el.tabs('destroy');
103+
el.tabs({ selected: 99 });
104+
equals(el.tabs('option', 'selected'), 0, 'selected should default to zero if given value is out of index');
105+
106+
el.tabs('destroy');
107+
el.tabs({ collapsible: true });
108+
el.tabs('option', 'selected', 0);
109+
equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if value is same as selected');
110+
111+
el.tabs('destroy');
112+
el = $('#tabs1').tabs();
113+
el.tabs('select', 1);
114+
equals(el.tabs('option', 'selected'), 1, 'should select tab');
115+
});
116+
68117
module("tabs (deprecated): events");
69118

70119
test('enable', function() {

‎tests/unit/tabs/tabs_events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test('beforeload', function() {
3232
el = $('#tabs2');
3333

3434
el.tabs({
35-
selected: 2,
35+
active: 2,
3636
beforeload: function( event, ui ) {
3737
ok( $.isFunction( ui.jqXHR.promise ), 'contain jqXHR object');
3838
equals( ui.settings.url, "data/test.html", 'contain ajax settings url');

‎tests/unit/tabs/tabs_methods.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test('init', function() {
1616
ok( $('div:eq(0)', el).is('.ui-tabs-panel.ui-widget-content.ui-corner-bottom'), 'attach classes to panel' );
1717
ok( $('li:eq(0)', el).is('.ui-tabs-selected.ui-state-active.ui-corner-top'), 'attach classes to active li');
1818
ok( $('li:eq(1)', el).is('.ui-state-default.ui-corner-top'), 'attach classes to inactive li');
19-
equals( el.tabs('option', 'selected'), 0, 'selected option set' );
19+
equals( el.tabs('option', 'active'), 0, 'active option set' );
2020
equals( $('li', el).index( $('li.ui-tabs-selected', el) ), 0, 'second tab active');
2121
equals( $('div', el).index( $('div.ui-tabs-hide', '#tabs1') ), 1, 'second panel should be hidden' );
2222
});
@@ -30,7 +30,7 @@ test('init with hash', function() {
3030
//selection of tab with divs ordered differently than list
3131
el = $('#tabs1').tabs();
3232

33-
equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
33+
equals(el.tabs('option', 'active'), 1, 'second tab should be active');
3434

3535
ok(!$('#tabs1 ul li:eq(0)').is('.ui-tabs-selected.ui-state-active'), 'first tab should not be selected nor active');
3636
ok($('#tabs1 div:eq(0)').is('.ui-tabs-hide'), 'first div for first tab should be hidden');
@@ -48,7 +48,7 @@ test('init mismatched order with hash', function() {
4848
//selection of tab with divs ordered differently than list
4949
el = $('#tabs7').tabs();
5050

51-
equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
51+
equals(el.tabs('option', 'active'), 1, 'second tab should be active');
5252

5353
ok(!$('#tabs7-list li:eq(0)').is('.ui-tabs-selected.ui-state-active'), 'first tab should not be selected nor active');
5454
ok($('#tabs7 div:eq(1)').is('.ui-tabs-hide'), 'second div for first tab should be hidden');
@@ -136,27 +136,27 @@ test('select', function() {
136136
el = $('#tabs1').tabs();
137137

138138
el.tabs('select', 1);
139-
equals(el.tabs('option', 'selected'), 1, 'should select tab');
139+
equals(el.tabs('option', 'active'), 1, 'should select tab');
140140

141141
el.tabs('destroy');
142142
el.tabs({ collapsible: true });
143143
el.tabs('select', 0);
144-
equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in the already selected tab');
144+
equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in the already active tab');
145145

146146
el.tabs('destroy');
147147
el.tabs({ collapsible: true });
148148
el.tabs('select', -1);
149-
equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in -1');
149+
equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in -1');
150150

151151
el.tabs('destroy');
152152
el.tabs();
153153
el.tabs('select', 0);
154-
equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
154+
equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
155155
el.tabs('select', -1);
156-
equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
156+
equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
157157

158158
el.tabs('select', '#fragment-2');
159-
equals(el.tabs('option', 'selected'), 1, 'should select tab by id');
159+
equals(el.tabs('option', 'active'), 1, 'should select tab by id');
160160
});
161161

162162
test('refresh', function() {
@@ -165,7 +165,7 @@ test('refresh', function() {
165165
var el = $('<div id="tabs"><ul></ul></div>').tabs(),
166166
ul = el.find('ul');
167167

168-
equals(el.tabs('option', 'selected'), -1, 'Initially empty, no selected tab');
168+
equals(el.tabs('option', 'active'), -1, 'Initially empty, no active tab');
169169

170170
ul.append('<li><a href="data/test.html">Test 1</a></li>');
171171
el.tabs('refresh');
@@ -179,12 +179,12 @@ test('refresh', function() {
179179
$('<div id="test1">Test Panel 1</div>').insertAfter( ul );
180180
el.tabs('refresh');
181181
el.tabs('select', 0);
182-
equals( el.tabs('option', 'selected'), 0, 'First tab added should be auto selected');
182+
equals( el.tabs('option', 'active'), 0, 'First tab added should be auto active');
183183

184184
ul.append('<li><a href="#test2">Test 2</a></li>');
185185
$('<div id="test2">Test Panel 2</div>').insertAfter( ul );
186186
el.tabs('refresh');
187-
equals( el.tabs('option', 'selected'), 0, 'Second tab added should not be auto selected');
187+
equals( el.tabs('option', 'active'), 0, 'Second tab added should not be auto active');
188188
});
189189

190190
test('load', function() {

‎tests/unit/tabs/tabs_options.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ test('cookie', function() {
3434
equals(cookie(), 0, 'initial cookie value');
3535

3636
el.tabs('destroy');
37-
el.tabs({ selected: 1, cookie: cookieObj });
38-
equals(cookie(), 1, 'initial cookie value, from selected property');
37+
el.tabs({ active: 1, cookie: cookieObj });
38+
equals(cookie(), 1, 'initial cookie value, from active property');
3939

4040
el.tabs('select', 2);
4141
equals(cookie(), 2, 'cookie value updated after select');
@@ -79,34 +79,34 @@ test('fx', function() {
7979
ok(false, "missing test - untested code is broken code.");
8080
});
8181

82-
test('selected', function() {
82+
test('active', function() {
8383
expect(8);
8484

8585
el = $('#tabs1').tabs();
86-
equals(el.tabs('option', 'selected'), 0, 'should be 0 by default');
86+
equals(el.tabs('option', 'active'), 0, 'should be 0 by default');
8787

8888
el.tabs('destroy');
89-
el.tabs({ selected: -1 });
90-
equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected');
91-
equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be selected' );
89+
el.tabs({ active: -1 });
90+
equals(el.tabs('option', 'active'), -1, 'should be -1 for all tabs deactive');
91+
equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be active' );
9292
equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );
9393

9494
el.tabs('destroy');
95-
el.tabs({ selected: null });
96-
equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected with value null (deprecated)');
95+
el.tabs({ active: null });
96+
equals(el.tabs('option', 'active'), -1, 'should be -1 for all tabs deactive with value null (deprecated)');
9797

9898
el.tabs('destroy');
99-
el.tabs({ selected: 1 });
100-
equals(el.tabs('option', 'selected'), 1, 'should be specified tab');
99+
el.tabs({ active: 1 });
100+
equals(el.tabs('option', 'active'), 1, 'should be specified tab');
101101

102102
el.tabs('destroy');
103-
el.tabs({ selected: 99 });
104-
equals(el.tabs('option', 'selected'), 0, 'selected should default to zero if given value is out of index');
103+
el.tabs({ active: 99 });
104+
equals(el.tabs('option', 'active'), 0, 'active should default to zero if given value is out of index');
105105

106106
el.tabs('destroy');
107107
el.tabs({ collapsible: true });
108-
el.tabs('option', 'selected', 0);
109-
equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if value is same as selected');
108+
el.tabs('option', 'active', 0);
109+
equals(el.tabs('option', 'active'), 0, 'should not collapse tab if value is same as active');
110110
});
111111

112112
})(jQuery);

‎tests/unit/tabs/tabs_tickets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ test('#3627 - Ajax tab with url containing a fragment identifier fails to load',
4343
expect(1);
4444

4545
el = $('#tabs2').tabs({
46-
selected: 2,
46+
active: 2,
4747
beforeload: function( event, ui ) {
4848
event.preventDefault();
4949
ok(/test.html$/.test( ui.settings.url ), 'should ignore fragment identifier');

0 commit comments

Comments
 (0)