Tabs: Only trigger tabsload on success.

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 49e89b7a0a81f8cd7c9a1034435398ed916147c5..a9f1f032faf26286d0254ba4eb9a81443b6d50e5 100644 (file)
--- 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
index 8da11367ebcfacc972b0bebdd5e2d8cebad35190..e7d4e3513e07863f63fd987e4fcc4fd978f507ca 100644 (file)
--- 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;
                                });
                }