Tabs: Deprecate url method; use aria-controls instead of title to specify panels. Fixes #7132 Tabs: Deprecate url method; use aria-controls instead of title to specify panels

3 files changed, 40 insertions, 25 deletions

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 880ea075e..ef03d84cb 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -1,5 +1,19 @@
 (function( $ ) {
 
+module("tabs (deprecated): core");
+
+test( "#4581 - title attribute for remote tabs does not support foreign languages", function() {
+	expect( 1 );
+
+	$( "#tabs2" ).tabs({
+		selected: 3,
+		beforeload: function( event, ui ) {
+			event.preventDefault();
+			equal( ui.panel.id, "∫ßáö_Սե", "proper title" );
+		}
+	});
+});
+
 module("tabs (deprecated): options");
 
 test('ajaxOptions', function() {
@@ -148,4 +162,14 @@ test('length', function() {
 	equals(el.tabs('length'), $('ul a', el).length, ' should return length');
 });
 
+test('url', function() {
+	el = $('#tabs2').tabs();
+	var tab = el.find('a:eq(3)'),
+		url = tab.attr('href');
+
+	el.tabs('url', 3, "data/test2.html");
+	equals(tab.attr('href'), 'data/test2.html', 'Url was updated');
+	tab.attr('href', url );
+});
+
 }( jQuery ) );
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index 50b8abd27..e00a95a3e 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -191,8 +191,4 @@ test('load', function() {
 	ok(false, "missing test - untested code is broken code.");
 });
 
-test('url', function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
 })(jQuery);
diff --git a/tests/unit/tabs/tabs_tickets.js b/tests/unit/tabs/tabs_tickets.js
index c301e9eb0..9df72a6f7 100644
--- a/tests/unit/tabs/tabs_tickets.js
+++ b/tests/unit/tabs/tabs_tickets.js
@@ -42,21 +42,29 @@ test('#3627 - Ajax tab with url containing a fragment identifier fails to load',
 	// http://dev.jqueryui.com/ticket/3627
 	expect(1);
 
-	el = $('#tabs2').tabs();
-	
-	ok(/test.html$/.test( $('a:eq(2)', el).data('load.tabs') ), 'should ignore fragment identifier');
-
+	el = $('#tabs2').tabs({
+		selected: 2,
+		beforeload: function( event, ui ) {
+			event.preventDefault();
+			ok(/test.html$/.test( ui.settings.url ), 'should ignore fragment identifier');
+		}
+	});
 });
 
 test('#4033 - IE expands hash to full url and misinterprets tab as ajax', function() {
 	// http://dev.jqueryui.com/ticket/4033
 	expect(1);
 	
-	el = $('<div><ul><li><a href="#tab">Tab</a></li></ul><div id="tab"></div></div>')
-			.appendTo('#main').tabs();
+	el = $('<div><ul><li><a href="#tab">Tab</a></li></ul><div id="tab"></div></div>');
+	el.appendTo('#main');
+	el.tabs({
+		beforeload: function( event, ui ) {
+			event.preventDefault();
+			ok( false, 'should not be an ajax tab');
+		}
+	});
 
-	equals($('a', el).data('load.tabs'), undefined, 'should not create ajax tab');
-	
+	equals($('a', el).attr('aria-controls'), '#tab', 'aria-contorls attribute is correct');
 });
 
 test('#5893 - Sublist in the tab list are considered as tab', function() {
@@ -68,19 +76,6 @@ test('#5893 - Sublist in the tab list are considered as tab', function() {
 
 });
 
-asyncTest( "#4581 - title attribute for remote tabs does not support foreign languages", function() {
-	expect( 1 );
-	
-	$( "#tabs2" ).tabs({
-		selected: 3,
-		load: function( event, ui ) {
-			equal( ui.panel.id, "∫ßáö_Սե", "proper title" );
-			start();
-		}
-	});
-});
-
-
 test('#6710 - selectors are global', function() {
 	// http://bugs.jqueryui.com/ticket/6710
 	expect(1);