aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.tabs.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-04-26 22:05:44 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-04-26 22:05:44 +0200
commitcd61fb1b55cc0f7cc2dc206170b1d95381edad9d (patch)
tree51cbd0ae1410bb32d9f943097581c581e3e106fb /ui/jquery.ui.tabs.js
parentf7d2fdbab8f6e0ea37fb02f9458489990305ff2f (diff)
parent325ee6e87133dd2a507c820dd3c356e3b897a3ec (diff)
downloadjquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.tar.gz
jquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.zip
Merge branch 'master' into menubar
Conflicts: ui/jquery.ui.menu.js
Diffstat (limited to 'ui/jquery.ui.tabs.js')
-rwxr-xr-xui/jquery.ui.tabs.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 699c1a5ee..82d3f186d 100755
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -26,13 +26,15 @@ function getNextListId() {
$.widget( "ui.tabs", {
options: {
- activate: null,
active: null,
- beforeActivate: null,
- beforeLoad: null,
collapsible: false,
event: "click",
fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+
+ // callbacks
+ activate: null,
+ beforeActivate: null,
+ beforeLoad: null,
load: null
},