Skip to content

Commit

Permalink
Dialog: If the browser doesn't support minHeight, use height to set t…
Browse files Browse the repository at this point in the history 
…he minHeight. Fixes #6027 - Dialog: minHeight isn't properly handled on init in IE6.
  • Loading branch information
@scottgonzalez
scottgonzalez committed Sep 7, 2010
1 parent 99694e6 commit 52e543a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ui/jquery.ui.dialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,8 @@ $.widget("ui.dialog", {
this.element
.css(options.height === 'auto' ? {
minHeight: Math.max(options.minHeight - nonContentHeight, 0),
height: 'auto'
height: $.support.minHeight ? 'auto' :
Math.max(options.minHeight - nonContentHeight, 0)
} : {
minHeight: 0,
height: Math.max(options.height - nonContentHeight, 0)
Expand Down

2 comments on commit 52e543a

@ocombe
Copy link

@ocombe ocombe commented on 52e543a Sep 20, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modification triggered a bug for a few clients on chrome, their window had a height of ~50px, i had to revert this change to get the normal behaviour (or I could add width: 'auto' in modal options for all my modals but hey, too boring ^^)
but I don't know why they had this bug, I couldn't reproduce it on chrome myself
@scottgonzalez
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't affect Chrome at all since it supports minHeight.
Please sign in to comment.