Tabs: Rename select event to beforeActivate. Fixes #7136 Tabs: Rename select event to beforeActivate

4 files changed, 29 insertions, 7 deletions

diff --git a/tests/unit/tabs/tabs_defaults.js b/tests/unit/tabs/tabs_defaults.js
index e155a3dac..194d2b76c 100644
--- a/tests/unit/tabs/tabs_defaults.js
+++ b/tests/unit/tabs/tabs_defaults.js
@@ -5,13 +5,13 @@
 var tabs_defaults = {
 	activate: null,
 	beforeload: null,
+	beforeActivate: null,
 	collapsible: false,
 	cookie: null,
 	disabled: false,
 	event: "click",
 	fx: null,
-	load: null,
-	select: null
+	load: null
 };
 
 // FAIL: falsy values break the cookie option
diff --git a/tests/unit/tabs/tabs_defaults_deprecated.js b/tests/unit/tabs/tabs_defaults_deprecated.js
index 47fd75d8f..03ee13d3d 100644
--- a/tests/unit/tabs/tabs_defaults_deprecated.js
+++ b/tests/unit/tabs/tabs_defaults_deprecated.js
@@ -7,6 +7,7 @@ var tabs_defaults = {
 	add: null,
 	ajaxOptions: null,
 	beforeload: null,
+	beforeActivate: null,
 	cache: false,
 	collapsible: false,
 	cookie: null,
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index ba1a778b0..38fa6db71 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -188,6 +188,27 @@ test('show', function() {
 
 });
 
+test('select', function() {
+	expect(7);
+
+	var eventObj;
+	el = $('#tabs1').tabs({
+		select: function(event, ui) {
+			ok(true, 'select triggered after initialization');
+			equals(this, el[0], "context of callback");
+			equals(event.type, 'tabsselect', 'event type in callback');
+			equals(ui.tab, el.find('a')[1], 'contain tab as DOM anchor element');
+			equals(ui.panel, el.find('div')[1], 'contain panel as DOM div element');
+			equals(ui.index, 1, 'contain index');
+			evenObj = event;
+		}
+	});
+	el.tabs('select', 1);
+
+	el.find( "li:eq(1) a" ).simulate( "click" );
+	equals( evenObj.originalEvent.type, "click", "select triggered by click" );
+});
+
 module("tabs (deprecated): methods");
 
 test('add', function() {
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 60affd7ff..4fedde842 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -5,15 +5,15 @@
 
 module("tabs: events");
 
-test('select', function() {
+test('beforeActivate', function() {
 	expect(7);
 
 	var eventObj;
 	el = $('#tabs1').tabs({
-		select: function(event, ui) {
-			ok(true, 'select triggered after initialization');
+		beforeActivate: function(event, ui) {
+			ok(true, 'beforeActivate triggered after initialization');
 			equals(this, el[0], "context of callback");
-			equals(event.type, 'tabsselect', 'event type in callback');
+			equals(event.type, 'tabsbeforeactivate', 'event type in callback');
 			equals(ui.tab, el.find('a')[1], 'contain tab as DOM anchor element');
 			equals(ui.panel, el.find('div')[1], 'contain panel as DOM div element');
 			equals(ui.index, 1, 'contain index');
@@ -23,7 +23,7 @@ test('select', function() {
 	el.tabs('select', 1);
 
 	el.find( "li:eq(1) a" ).simulate( "click" );
-	equals( evenObj.originalEvent.type, "click", "select triggered by click" );
+	equals( evenObj.originalEvent.type, "click", "beforeActivate triggered by click" );
 });
 
 test('beforeload', function() {