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

diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js
index 296102c9bdc1ff0f5924a21252b7b0c17571b31c..dfa480fb74ce30cbabe32b3b659111c763be82d4 100644 (file)
--- a/tests/unit/dialog/dialog_tickets.js
+++ b/tests/unit/dialog/dialog_tickets.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);

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index df11e2190a16f2bf28373f0cc1993d97b628bf99..44f5cbbbc9ab264b1d08dacf96a031f87d291619 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -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({