Tabs: Rename selected option to active. Fixes #7135 Tabs: Rename selected option to active

5 files changed, 78 insertions, 29 deletions

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 7e4816793..8b6b50d7e 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -65,6 +65,55 @@ test('spinner', function() {
 	});
 });
 
+test('selected', function() {
+	expect(11);
+
+	el = $('#tabs1').tabs();
+	equals(el.tabs('option', 'selected'), 0, 'should be 0 by default');
+
+	el.tabs('destroy');
+	//set a hash in the url
+	location.hash = '#fragment-2';
+	//selection of tab with divs ordered differently than list
+	el = $('#tabs1').tabs();
+	equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
+
+	el.tabs('destroy');
+	//set a hash in the url
+	location.hash = '#tabs7-2';
+	//selection of tab with divs ordered differently than list
+	el = $('#tabs7').tabs();
+	equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
+
+	el.tabs('destroy');
+	el = $('#tabs1').tabs({ selected: -1 });
+	equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected');
+	equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be selected' );
+	equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );
+
+	el.tabs('destroy');
+	el.tabs({ selected: null });
+	equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected with value null (deprecated)');
+
+	el.tabs('destroy');
+	el.tabs({ selected: 1 });
+	equals(el.tabs('option', 'selected'), 1, 'should be specified tab');
+
+	el.tabs('destroy');
+	el.tabs({ selected: 99 });
+	equals(el.tabs('option', 'selected'), 0, 'selected should default to zero if given value is out of index');
+
+	el.tabs('destroy');
+	el.tabs({ collapsible: true });
+	el.tabs('option', 'selected', 0);
+	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if value is same as selected');
+
+	el.tabs('destroy');
+	el = $('#tabs1').tabs();
+	el.tabs('select', 1);
+	equals(el.tabs('option', 'selected'), 1, 'should select tab');
+});
+
 module("tabs (deprecated): events");
 
 test('enable', function() {
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index b3f8653a2..04f282157 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -32,7 +32,7 @@ test('beforeload', function() {
 	el = $('#tabs2');
 
 	el.tabs({
-		selected: 2,
+		active: 2,
 		beforeload: function( event, ui ) {
 			ok( $.isFunction( ui.jqXHR.promise ), 'contain jqXHR object');
 			equals( ui.settings.url, "data/test.html", 'contain ajax settings url');
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index e00a95a3e..dbb5c2d15 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -16,7 +16,7 @@ test('init', function() {
 	ok( $('div:eq(0)', el).is('.ui-tabs-panel.ui-widget-content.ui-corner-bottom'), 'attach classes to panel' );
 	ok( $('li:eq(0)', el).is('.ui-tabs-selected.ui-state-active.ui-corner-top'), 'attach classes to active li');
 	ok( $('li:eq(1)', el).is('.ui-state-default.ui-corner-top'), 'attach classes to inactive li');
-	equals( el.tabs('option', 'selected'), 0, 'selected option set' );
+	equals( el.tabs('option', 'active'), 0, 'active option set' );
 	equals( $('li', el).index( $('li.ui-tabs-selected', el) ), 0, 'second tab active');
 	equals( $('div', el).index( $('div.ui-tabs-hide', '#tabs1') ), 1, 'second panel should be hidden' );
 });
@@ -30,7 +30,7 @@ test('init with hash', function() {
 	//selection of tab with divs ordered differently than list
 	el = $('#tabs1').tabs();
 	
-	equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
+	equals(el.tabs('option', 'active'), 1, 'second tab should be active');
 	
 	ok(!$('#tabs1 ul li:eq(0)').is('.ui-tabs-selected.ui-state-active'), 'first tab should not be selected nor active');
 	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() {
 	//selection of tab with divs ordered differently than list
 	el = $('#tabs7').tabs();
 	
-	equals(el.tabs('option', 'selected'), 1, 'second tab should be selected');
+	equals(el.tabs('option', 'active'), 1, 'second tab should be active');
 	
 	ok(!$('#tabs7-list li:eq(0)').is('.ui-tabs-selected.ui-state-active'), 'first tab should not be selected nor active');
 	ok($('#tabs7 div:eq(1)').is('.ui-tabs-hide'), 'second div for first tab should be hidden');
@@ -136,27 +136,27 @@ test('select', function() {
 	el = $('#tabs1').tabs();
 
 	el.tabs('select', 1);
-	equals(el.tabs('option', 'selected'), 1, 'should select tab');
+	equals(el.tabs('option', 'active'), 1, 'should select tab');
 
 	el.tabs('destroy');
 	el.tabs({ collapsible: true });
 	el.tabs('select', 0);
-	equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in the already selected tab');
+	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in the already active tab');
 
 	el.tabs('destroy');
 	el.tabs({ collapsible: true });
 	el.tabs('select', -1);
-	equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in -1');
+	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in -1');
 
 	el.tabs('destroy');
 	el.tabs();
 	el.tabs('select', 0);
-	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
+	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
 	el.tabs('select', -1);
-	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
+	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
 
 	el.tabs('select', '#fragment-2');
-	equals(el.tabs('option', 'selected'), 1, 'should select tab by id');
+	equals(el.tabs('option', 'active'), 1, 'should select tab by id');
 });
 
 test('refresh', function() {
@@ -165,7 +165,7 @@ test('refresh', function() {
 	var el = $('<div id="tabs"><ul></ul></div>').tabs(),
 		ul = el.find('ul');
 
-	equals(el.tabs('option', 'selected'), -1, 'Initially empty, no selected tab');
+	equals(el.tabs('option', 'active'), -1, 'Initially empty, no active tab');
 
 	ul.append('<li><a href="data/test.html">Test 1</a></li>');
 	el.tabs('refresh');
@@ -179,12 +179,12 @@ test('refresh', function() {
 	$('<div id="test1">Test Panel 1</div>').insertAfter( ul );
 	el.tabs('refresh');
 	el.tabs('select', 0);
-	equals( el.tabs('option', 'selected'), 0, 'First tab added should be auto selected');
+	equals( el.tabs('option', 'active'), 0, 'First tab added should be auto active');
 
 	ul.append('<li><a href="#test2">Test 2</a></li>');
 	$('<div id="test2">Test Panel 2</div>').insertAfter( ul );
 	el.tabs('refresh');
-	equals( el.tabs('option', 'selected'), 0, 'Second tab added should not be auto selected');
+	equals( el.tabs('option', 'active'), 0, 'Second tab added should not be auto active');
 });
 
 test('load', function() {
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index de6d7e74e..b1a7a5e78 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -34,8 +34,8 @@ test('cookie', function() {
 	equals(cookie(), 0, 'initial cookie value');
 
 	el.tabs('destroy');
-	el.tabs({ selected: 1, cookie: cookieObj });
-	equals(cookie(), 1, 'initial cookie value, from selected property');
+	el.tabs({ active: 1, cookie: cookieObj });
+	equals(cookie(), 1, 'initial cookie value, from active property');
 
 	el.tabs('select', 2);
 	equals(cookie(), 2, 'cookie value updated after select');
@@ -79,34 +79,34 @@ test('fx', function() {
 	ok(false, "missing test - untested code is broken code.");
 });
 
-test('selected', function() {
+test('active', function() {
 	expect(8);
 
 	el = $('#tabs1').tabs();
-	equals(el.tabs('option', 'selected'), 0, 'should be 0 by default');
+	equals(el.tabs('option', 'active'), 0, 'should be 0 by default');
 
 	el.tabs('destroy');
-	el.tabs({ selected: -1 });
-	equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected');
-	equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be selected' );
+	el.tabs({ active: -1 });
+	equals(el.tabs('option', 'active'), -1, 'should be -1 for all tabs deactive');
+	equals( $('li.ui-tabs-selected', el).length, 0, 'no tab should be active' );
 	equals( $('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden' );
 
 	el.tabs('destroy');
-	el.tabs({ selected: null });
-	equals(el.tabs('option', 'selected'), -1, 'should be -1 for all tabs unselected with value null (deprecated)');
+	el.tabs({ active: null });
+	equals(el.tabs('option', 'active'), -1, 'should be -1 for all tabs deactive with value null (deprecated)');
 
 	el.tabs('destroy');
-	el.tabs({ selected: 1 });
-	equals(el.tabs('option', 'selected'), 1, 'should be specified tab');
+	el.tabs({ active: 1 });
+	equals(el.tabs('option', 'active'), 1, 'should be specified tab');
 
 	el.tabs('destroy');
-	el.tabs({ selected: 99 });
-	equals(el.tabs('option', 'selected'), 0, 'selected should default to zero if given value is out of index');
+	el.tabs({ active: 99 });
+	equals(el.tabs('option', 'active'), 0, 'active should default to zero if given value is out of index');
 
 	el.tabs('destroy');
 	el.tabs({ collapsible: true });
-	el.tabs('option', 'selected', 0);
-	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if value is same as selected');
+	el.tabs('option', 'active', 0);
+	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if value is same as active');
 });
 
 })(jQuery);
diff --git a/tests/unit/tabs/tabs_tickets.js b/tests/unit/tabs/tabs_tickets.js
index 9df72a6f7..486d3b6d2 100644
--- a/tests/unit/tabs/tabs_tickets.js
+++ b/tests/unit/tabs/tabs_tickets.js
@@ -43,7 +43,7 @@ test('#3627 - Ajax tab with url containing a fragment identifier fails to load',
 	expect(1);
 
 	el = $('#tabs2').tabs({
-		selected: 2,
+		active: 2,
 		beforeload: function( event, ui ) {
 			event.preventDefault();
 			ok(/test.html$/.test( ui.settings.url ), 'should ignore fragment identifier');