diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-04-26 22:05:44 +0200 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-04-26 22:05:44 +0200 |
commit | cd61fb1b55cc0f7cc2dc206170b1d95381edad9d (patch) | |
tree | 51cbd0ae1410bb32d9f943097581c581e3e106fb /tests/unit/tabs/tabs_defaults.js | |
parent | f7d2fdbab8f6e0ea37fb02f9458489990305ff2f (diff) | |
parent | 325ee6e87133dd2a507c820dd3c356e3b897a3ec (diff) | |
download | jquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.tar.gz jquery-ui-cd61fb1b55cc0f7cc2dc206170b1d95381edad9d.zip |
Merge branch 'master' into menubar
Conflicts:
ui/jquery.ui.menu.js
Diffstat (limited to 'tests/unit/tabs/tabs_defaults.js')
-rw-r--r-- | tests/unit/tabs/tabs_defaults.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/unit/tabs/tabs_defaults.js b/tests/unit/tabs/tabs_defaults.js index e15d618de..52b6f8a71 100644 --- a/tests/unit/tabs/tabs_defaults.js +++ b/tests/unit/tabs/tabs_defaults.js @@ -1,13 +1,16 @@ commonWidgetTests( "tabs", { defaults: { - activate: null, active: null, - beforeLoad: null, - beforeActivate: null, collapsible: false, disabled: false, event: "click", fx: null, + + // callbacks + activate: null, + beforeActivate: null, + beforeLoad: null, + create: null, load: null } }); |