diff options
| -rw-r--r-- | tests/unit/tabs/tabs_common_deprecated.js | 1 | ||||
| -rw-r--r-- | tests/unit/tabs/tabs_deprecated.js | 18 | ||||
| -rw-r--r-- | ui/jquery.ui.tabs.js | 26 |
3 files changed, 0 insertions, 45 deletions
diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 0d381f9e9..a21489cda 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -9,7 +9,6 @@ TestHelpers.commonWidgetTests( "tabs", { idPrefix: "ui-tabs-", panelTemplate: "<div></div>", show: null, - spinner: "<em>Loading…</em>", tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>", // callbacks diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 9f0e320cc..4d6d682f5 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -66,24 +66,6 @@ test( "tabTemplate + panelTemplate", function() { ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); }); -asyncTest( "spinner", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - - element.one( "tabsbeforeload", function() { - equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 1, "beforeload" ); - }); - element.one( "tabsload", function() { - // wait until after the load finishes before checking for the spinner to be removed - setTimeout(function() { - equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" ); - start(); - }, 1 ); - }); - element.tabs( "option", "active", 2 ); -}); - module( "tabs (deprecated): events" ); asyncTest( "load", function() { diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 09946072e..45ac8e81c 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -863,32 +863,6 @@ if ( $.uiBackCompat !== false ) { } }); - // spinner - $.widget( "ui.tabs", $.ui.tabs, { - options: { - spinner: "<em>Loading…</em>" - }, - _create: function() { - this._super(); - this._on({ - tabsbeforeload: function( event, ui ) { - // Don't react to nested tabs or tabs that don't use a spinner - if ( event.target !== this.element[ 0 ] || - !this.options.spinner ) { - return; - } - - var span = ui.tab.find( "span" ), - html = span.html(); - span.html( this.options.spinner ); - ui.jqXHR.complete(function() { - span.html( html ); - }); - } - }); - } - }); - // add/remove methods and events $.widget( "ui.tabs", $.ui.tabs, { options: { |