aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/menu/menu_defaults.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 /tests/unit/menu/menu_defaults.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 'tests/unit/menu/menu_defaults.js')
-rw-r--r--tests/unit/menu/menu_defaults.js21
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/unit/menu/menu_defaults.js b/tests/unit/menu/menu_defaults.js
index 58122fea2..dd182ca09 100644
--- a/tests/unit/menu/menu_defaults.js
+++ b/tests/unit/menu/menu_defaults.js
@@ -1,13 +1,12 @@
-/*
- * menu_defaults.js
- */
+commonWidgetTests( "menu", {
+ defaults: {
+ disabled: false,
+ position: {
+ my: "left top",
+ at: "right top"
+ },
-var menu_defaults = {
- disabled: false,
- position: {
- my: "left top",
- at: "right top"
+ // callbacks
+ create: null
}
-};
-
-commonWidgetTests('menu', { defaults: menu_defaults });
+});