aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/button/button_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/button/button_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/button/button_defaults.js')
-rw-r--r--tests/unit/button/button_defaults.js25
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/unit/button/button_defaults.js b/tests/unit/button/button_defaults.js
index b81fa7cbb..96c7e5bfa 100644
--- a/tests/unit/button/button_defaults.js
+++ b/tests/unit/button/button_defaults.js
@@ -1,15 +1,14 @@
-/*
- * button_defaults.js
- */
+commonWidgetTests( "button", {
+ defaults: {
+ disabled: null,
+ icons: {
+ primary: null,
+ secondary: null
+ },
+ label: null,
+ text: true,
-var button_defaults = {
- disabled: null,
- text: true,
- label: null,
- icons: {
- primary: null,
- secondary: null
+ // callbacks
+ create: null
}
-};
-
-commonWidgetTests('button', { defaults: button_defaults });
+});