aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-08-30 09:44:31 -0400
committerScott González <scott.gonzalez@gmail.com>2012-08-30 09:44:57 -0400
commit13fa4a9dac1ea993b659602f51b2fec28fa2b8f9 (patch)
tree0c5d8e131581d338601aad26435b8146e876826a
parent7852583980decd716f6c2ed37b1e1d7705332989 (diff)
downloadjquery-ui-13fa4a9dac1ea993b659602f51b2fec28fa2b8f9.tar.gz
jquery-ui-13fa4a9dac1ea993b659602f51b2fec28fa2b8f9.zip
Tabs: Don't apply a spinner when nested tabs are loading. Fixes #8529 - tabs with in tabs, heading appears as Loading....
-rw-r--r--ui/jquery.ui.tabs.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 524f4178e..7631366d6 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -948,7 +948,9 @@ if ( $.uiBackCompat !== false ) {
this._super();
this._on({
tabsbeforeload: function( event, ui ) {
- if ( !this.options.spinner ) {
+ // Don't react to nested tabs or tabs that don't use a spinner
+ if ( event.target !== this.element[ 0 ] ||
+ !this.options.spinner ) {
return;
}