aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-04-04 14:27:38 -0400
committerScott González <scott.gonzalez@gmail.com>2011-04-04 14:27:38 -0400
commite19d8261c136e6c0b40e08b5bede24467b3dcc0f (patch)
tree992066c2358b3cd281b4f47013f5c6106e6134b2 /ui
parentfc5291291bcea7a4dd5fc07fcd6a7b4e55ae55c0 (diff)
downloadjquery-ui-e19d8261c136e6c0b40e08b5bede24467b3dcc0f.tar.gz
jquery-ui-e19d8261c136e6c0b40e08b5bede24467b3dcc0f.zip
Tabs: Properly handle switching from active: false.
Diffstat (limited to 'ui')
-rwxr-xr-xui/jquery.ui.tabs.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index d5ed5e67e..99c561607 100755
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -364,7 +364,7 @@ $.widget( "ui.tabs", {
options.active = collapsing ? false : that.anchors.index( clicked );
- that.active = clicked;
+ that.active = clickedIsActive ? $() : clicked;
if ( that.xhr ) {
that.xhr.abort();
}
@@ -422,12 +422,12 @@ $.widget( "ui.tabs", {
var active = this._findActive( index )[ 0 ];
// trying to activate the already active panel
- if ( this.active && active === this.active[ 0 ] ) {
+ if ( active === this.active[ 0 ] ) {
return;
}
// trying to collapse, simulate a click on the current active header
- active = active || this.active;
+ active = active || this.active[ 0 ];
this._eventHandler({
target: active,