aboutsummaryrefslogtreecommitdiffstats
path: root/ui/ui.tabs.js
diff options
context:
space:
mode:
authorKlaus Hartl <klaus.hartl@googlemail.com>2009-02-05 19:36:31 +0000
committerKlaus Hartl <klaus.hartl@googlemail.com>2009-02-05 19:36:31 +0000
commitfbc6ff5f812b673c5263d0ccaf3b2c2bf4d34790 (patch)
tree734e3ea045c716cac8efe697f4b69f0391eea3d3 /ui/ui.tabs.js
parent78adee126cbf4ec3147f698f5bb6d71199a51b65 (diff)
downloadjquery-ui-fbc6ff5f812b673c5263d0ccaf3b2c2bf4d34790.tar.gz
jquery-ui-fbc6ff5f812b673c5263d0ccaf3b2c2bf4d34790.zip
Tabs: fixed bug related to setting selected via data method, cleaned up mess in tests
Diffstat (limited to 'ui/ui.tabs.js')
-rw-r--r--ui/ui.tabs.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/ui.tabs.js b/ui/ui.tabs.js
index 1564af841..4b92cf249 100644
--- a/ui/ui.tabs.js
+++ b/ui/ui.tabs.js
@@ -21,9 +21,12 @@ $.widget("ui.tabs", {
},
_setData: function(key, value) {
- if (key == 'selected')
+ if (key == 'selected') {
+ if (this.options.collapsible
+ && value == this.options.selected) return;
+
this.select(value);
-
+ }
else {
this.options[key] = value;
if (key == 'deselectable')