mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Tabs: Removed spinner option. Fixes #7151 - Tabs: Remove spinner option.
This commit is contained in:
parent
a9053d9300
commit
6a00d418bc
@ -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
|
||||
|
@ -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() {
|
||||
|
26
ui/jquery.ui.tabs.js
vendored
26
ui/jquery.ui.tabs.js
vendored
@ -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: {
|
||||
|
Loading…
Reference in New Issue
Block a user