Tabs: Force ajax tabs to resolve asynchronously to avoid a bug caused by cached XHRs...

diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 12c9bb87b3e6d4ebdf90cc65066fe36233e366bd..f5cde180bb6ab8e77e737bba4258bf578a7fe10a 100644 (file)
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -206,7 +206,8 @@ test( "beforeLoad", function() {
        });
        element.find( ".ui-tabs-nav a" ).eq( 3 ).click();
        tabs_state( element, 0, 0, 0, 1, 0 );
-       equals( panel.html(), "<p>testing</p>", "panel html after" );
+       // .toLowerCase() is needed to convert <P> to <p> in old IEs
+       equals( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
 });
 
 if ( $.uiBackCompat === false ) {

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index a1bf72cb1357a7089d4c71d5d80089a4baa33783..4127ddf84a9f98b53263d2af390d5a864058ba74 100644 (file)
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -541,19 +541,27 @@ $.widget( "ui.tabs", {
 
                        this.xhr
                                .success(function( response ) {
-                                       panel.html( response );
-                                       self._trigger( "load", event, eventData );
+                                       // TODO: IE resolves cached XHRs immediately
+                                       // remove when core #10467 is fixed
+                                       setTimeout(function() {
+                                               panel.html( response );
+                                               self._trigger( "load", event, eventData );
+                                       }, 1 );
                                })
                                .complete(function( jqXHR, status ) {
-                                       if ( status === "abort" ) {
-                                               self.panels.stop( false, true );
-                                       }
-
-                                       self.lis.eq( index ).removeClass( "ui-tabs-loading" );
-
-                                       if ( jqXHR === self.xhr ) {
-                                               delete self.xhr;
-                                       }
+                                       // TODO: IE resolves cached XHRs immediately
+                                       // remove when core #10467 is fixed
+                                       setTimeout(function() {
+                                               if ( status === "abort" ) {
+                                                       self.panels.stop( false, true );
+                                               }
+       
+                                               self.lis.eq( index ).removeClass( "ui-tabs-loading" );
+       
+                                               if ( jqXHR === self.xhr ) {
+                                                       delete self.xhr;
+                                               }
+                                       });
                                });
                }