Permalink
Browse files

Dialog: modified so that minWidth is respected. Fixes #5531 - dialog …

…width should be at least minWidth on creation.
  • Loading branch information...
1 parent 90caa93 commit c5770c0e84b786ebe55a60034da0ff06dc02f422 Ziling Zhao committed with scottgonzalez Apr 19, 2010
Showing with 25 additions and 0 deletions.
  1. +21 −0 tests/unit/dialog/dialog_tickets.js
  2. +4 −0 ui/jquery.ui.dialog.js
@@ -40,4 +40,25 @@ test("#5184: isOpen in dialogclose event is true", function() {
el.remove();
});
+test("#5531: dialog width should be at least minWidth on creation", function () {
+ el = $('<div></div>').dialog({
+ width: 200,
+ minWidth: 300
+ });
+
+ equals(el.dialog('option', 'width'), 300, "width is minWidth");
+ el.dialog('option', 'width', 200);
+ equals(el.dialog('option', 'width'), 300, "width unchanged when set to < minWidth");
+ el.dialog('option', 'width', 320);
+ equals(el.dialog('option', 'width'), 320, "width changed if set to > minWidth");
+ el.remove();
+
+ el = $('<div></div>').dialog({
+ minWidth: 300
+ });
+ ok(el.dialog('option', 'width') >= 300, "width is at least 300");
+ el.remove();
+
+});
+
})(jQuery);
View
@@ -628,6 +628,10 @@ $.widget("ui.dialog", {
height: 0
});
+ if (options.minWidth > options.width) {
+ options.width = options.minWidth;
+ }
+
// reset wrapper sizing
// determine the height of all the non-content elements
nonContentHeight = this.uiDialog.css({

0 comments on commit c5770c0

Please sign in to comment.