diff options
-rw-r--r-- | tests/unit/dialog/dialog_defaults.js | 6 | ||||
-rw-r--r-- | ui/ui.dialog.js | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js index eb9d36bf7..9607bf194 100644 --- a/tests/unit/dialog/dialog_defaults.js +++ b/tests/unit/dialog/dialog_defaults.js @@ -12,13 +12,15 @@ var dialog_defaults = { dialogClass: '', draggable: true, height: 'auto', - maxHeight: undefined, - maxWidth: undefined, + hide: null, + maxHeight: false, + maxWidth: false, minHeight: 150, minWidth: 150, modal: false, position: 'center', resizable: true, + show: null, stack: true, title: '', width: 300, diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js index fb3def446..f6cd5ac20 100644 --- a/ui/ui.dialog.js +++ b/ui/ui.dialog.js @@ -484,12 +484,16 @@ $.extend($.ui.dialog, { closeText: 'close', dialogClass: '', draggable: true, + hide: null, height: 'auto', + maxHeight: false, + maxWidth: false, minHeight: 150, minWidth: 150, modal: false, position: 'center', resizable: true, + show: null, stack: true, title: '', width: 300, |