Tabs: Only trigger tabsload on success.

jquery · May 9, 2011 · 9ea6db6 · 9ea6db6
1 parent 0adeb9b
commit 9ea6db6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
@@ -156,8 +156,11 @@ asyncTest( "spinner", function() {
 		equals( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 1, "beforeload" );
 	});
 	element.one( "tabsload", function( event, ui ) {
-		equals( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" );
-		start();
+		// wait until after the load finishes before checking for the spinner to be removed
+		setTimeout(function() {
+			equals( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" );
+			start();
+		}, 1 );
 	});
 	element.tabs( "option", "active", 2 );
 });

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
@@ -621,6 +621,7 @@ $.widget( "ui.tabs", {
 			this.xhr
 				.success(function( response ) {
 					panel.html( response );
+					self._trigger( "load", event, eventData );
 				})
 				.complete(function( jqXHR, status ) {
 					if ( status === "abort" ) {
@@ -631,13 +632,11 @@ $.widget( "ui.tabs", {
 						// "tabs" queue must not contain more than two elements,
 						// which are the callbacks for the latest clicked tab...
 						self.element.queue( "tabs", self.element.queue( "tabs" ).splice( -2, 2 ) );
-
-						delete this.xhr;
 					}
 
 					self.lis.eq( index ).removeClass( "ui-tabs-loading" );
 
-					self._trigger( "load", event, eventData );
+					delete self.xhr;
 				});
 		}