Accordion: First pass at deprecating the activate method. Renamed _clickHandler to _eventHandler and removed extraneous parameter. Updated all tests to use the option methods instead of the activate method.

4 files changed, 8 insertions, 8 deletions

diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 640427e2e..40a711abf 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -22,7 +22,7 @@ test("ui-accordion-heading class added to headers anchor", function() {
 
 test("accessibility", function () {
 	expect(9);
-	var ac = $('#list1').accordion().accordion("activate", 1);
+	var ac = $('#list1').accordion().accordion("option", "active", 1);
 	var headers = $(".ui-accordion-header");
 
 	equals( headers.eq(1).attr("tabindex"), "0", "active header should have tabindex=0");
@@ -32,7 +32,7 @@ test("accessibility", function () {
 	equals( headers.next().attr("role"), "tabpanel", "tabpanel roles");
 	equals( headers.eq(1).attr("aria-expanded"), "true", "active tab has aria-expanded");
 	equals( headers.eq(0).attr("aria-expanded"), "false", "inactive tab has aria-expanded");
-	ac.accordion("activate", 0);
+	ac.accordion("option", "active", 0);
 	equals( headers.eq(0).attr("aria-expanded"), "true", "newly active tab has aria-expanded");
 	equals( headers.eq(1).attr("aria-expanded"), "false", "newly inactive tab has aria-expanded");
 });
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index e9e14996c..5793e46d0 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -17,14 +17,14 @@ test("accordionchange event, open closed and close again", function() {
 		equals( ui.newHeader.size(), 1 );
 		equals( ui.newContent.size(), 1 );
 	})
-	.accordion("activate", 0)
+	.accordion("option", "active", 0)
 	.one("accordionchange", function(event, ui) {
 		equals( ui.oldHeader.size(), 1 );
 		equals( ui.oldContent.size(), 1 );
 		equals( ui.newHeader.size(), 0 );
 		equals( ui.newContent.size(), 0 );
 	})
-	.accordion("activate", 0);
+	.accordion("option", "active", 0);
 });
 
 })(jQuery);
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
index ed5cb37b6..e46dba30a 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/accordion_methods.js
@@ -50,10 +50,10 @@ test("disable", function() {
 	equals(actual, expected, 'disable is chainable');
 	
 	state(expected, 1, 0, 0)
-	expected.accordion("activate", 1);
+	expected.accordion("option", "active", 1);
 	state(expected, 1, 0, 0)
 	expected.accordion("enable");
-	expected.accordion("activate", 1);
+	expected.accordion("option", "active", 1);
 	state(expected, 0, 1, 0)
 });
 
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 331ceb924..abfb82d78 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -61,7 +61,7 @@ test("{ active: Number }", function() {
 	$('.ui-accordion-header:eq(2)', '#list1').click();
 	equals( $("#list1").accordion('option', 'active'), 2);
 
-	$("#list1").accordion('activate', 0);
+	$("#list1").accordion('option', 'active', 0);
 	equals( $("#list1").accordion('option', 'active'), 0);
 });
 
@@ -96,7 +96,7 @@ test("{ heightStyle: 'content' }", function() {
 });
 test("{ collapsible: false }, default", function() {
 	var ac = $("#list1").accordion();
-	ac.accordion("activate", false);
+	ac.accordion("option", "active", false);
 	state(ac, 1, 0, 0);
 });