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/dialog/dialog_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/dialog/dialog_defaults.js')
-rw-r--r-- | tests/unit/dialog/dialog_defaults.js | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js index 612fd58c8..9f2e4c6a8 100644 --- a/tests/unit/dialog/dialog_defaults.js +++ b/tests/unit/dialog/dialog_defaults.js @@ -1,35 +1,34 @@ -/* - * dialog_defaults.js - */ +commonWidgetTests( "dialog", { + defaults: { + autoOpen: true, + buttons: {}, + closeOnEscape: true, + closeText: 'close', + disabled: false, + dialogClass: '', + draggable: true, + height: 'auto', + hide: null, + maxHeight: false, + maxWidth: false, + minHeight: 150, + minWidth: 150, + modal: false, + position: { + my: 'center', + at: 'center', + of: window, + collision: 'fit', + using: $.ui.dialog.prototype.options.position.using + }, + resizable: true, + show: null, + stack: true, + title: '', + width: 300, + zIndex: 1000, -var dialog_defaults = { - autoOpen: true, - buttons: {}, - closeOnEscape: true, - closeText: 'close', - disabled: false, - dialogClass: '', - draggable: true, - height: 'auto', - hide: null, - maxHeight: false, - maxWidth: false, - minHeight: 150, - minWidth: 150, - modal: false, - position: { - my: 'center', - at: 'center', - of: window, - collision: 'fit', - using: $.ui.dialog.prototype.options.position.using - }, - resizable: true, - show: null, - stack: true, - title: '', - width: 300, - zIndex: 1000 -}; - -commonWidgetTests('dialog', { defaults: dialog_defaults }); + // callbacks + create: null + } +}); |